From 8118f1ae6c78adf09b5434da67c303f336412cb7 Mon Sep 17 00:00:00 2001 From: Niek Haarman Date: Mon, 19 Dec 2016 14:25:43 +0100 Subject: [PATCH 1/4] Update Mockito to 2.3.9 --- mockito-kotlin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 301fd9ca..2b1436d3 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -28,7 +28,7 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.mockito:mockito-core:2.2.28" + compile "org.mockito:mockito-core:2.3.9" /* Tests */ testCompile "junit:junit:4.12" From 3c714eba76c591918c03a73214053ee12b19f07b Mon Sep 17 00:00:00 2001 From: Niek Haarman Date: Mon, 19 Dec 2016 14:27:02 +0100 Subject: [PATCH 2/4] Update Kotlin to 1.0.5-3 --- .travis.yml | 4 ++-- mockito-kotlin/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a59c65a6..ecc25a5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ language: java matrix: include: - jdk: oraclejdk7 - env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5-2 + env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5-3 - jdk: oraclejdk7 env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M03 - jdk: oraclejdk8 - env: TERM=dumb KOTLIN_VERSION=1.0.5-2 + env: TERM=dumb KOTLIN_VERSION=1.0.5-3 - jdk: oraclejdk8 env: TERM=dumb KOTLIN_VERSION=1.1-M03 diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 2b1436d3..218cec67 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -3,7 +3,7 @@ apply from: './publishing.gradle' apply plugin: 'org.jetbrains.dokka' buildscript { - ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5-2' + ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5-3' repositories { mavenCentral() From e3344f4754d2ad42c8ae41a129d7d5c2b22d28f6 Mon Sep 17 00:00:00 2001 From: Niek Haarman Date: Mon, 19 Dec 2016 14:40:00 +0100 Subject: [PATCH 3/4] Update Gradle wrapper to 3.2.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 46b1b27a..cf73567f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip From a1ea33b8824283becfa646870f21abfdfae6894b Mon Sep 17 00:00:00 2001 From: Niek Haarman Date: Mon, 19 Dec 2016 14:41:04 +0100 Subject: [PATCH 4/4] Update Dokka to 0.9.11 --- mockito-kotlin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 218cec67..c219d43d 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -13,7 +13,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.10" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.11" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3" classpath "com.github.dcendents:android-maven-gradle-plugin:1.5" }