diff --git a/.travis.yml b/.travis.yml index 0ee6174b..66d5c6cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ matrix: - jdk: oraclejdk8 env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50 - jdk: oraclejdk8 - env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0-rc-116 + env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0 - jdk: oraclejdk8 env: TERM=dumb KOTLIN_VERSION=1.0.7 - jdk: oraclejdk8 @@ -19,7 +19,7 @@ matrix: - jdk: oraclejdk8 env: TERM=dumb KOTLIN_VERSION=1.2.50 - jdk: oraclejdk8 - env: TERM=dumb KOTLIN_VERSION=1.3.0-rc-116 + env: TERM=dumb KOTLIN_VERSION=1.3.0 env: diff --git a/build.gradle b/build.gradle index 6fd77d17..40ac3cdc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,12 @@ buildscript { } } dependencies { - classpath "io.spring.gradle:spring-bintray-plugin:0.9.0" + classpath "io.spring.gradle:spring-bintray-plugin:0.11.1" } } plugins { - id 'com.github.ben-manes.versions' version '0.17.0' + id 'com.github.ben-manes.versions' version '0.20.0' } apply from: 'gradle/scripts/tagging.gradle' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 16f20835..6b6ea3ab 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1ae18bef..f2beea10 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 03 21:34:47 CET 2017 +#Mon Oct 29 21:53:52 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/gradlew b/gradlew index 4453ccea..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index b3229fb7..03f0515e 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -3,31 +3,29 @@ apply from: '../publishing.gradle' apply plugin: 'org.jetbrains.dokka' buildscript { - ext.kotlin_version = "1.3.0-rc-146" + ext.kotlin_version = "1.3.0" repositories { mavenCentral() jcenter() - maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.15" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0" - classpath "com.github.dcendents:android-maven-gradle-plugin:2.0" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4" + classpath "com.github.dcendents:android-maven-gradle-plugin:2.1" } } repositories { mavenCentral() jcenter() - maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13' + compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0' compile "org.mockito:mockito-core:2.23.0" @@ -35,9 +33,9 @@ dependencies { testCompile 'com.nhaarman:expect.kt:1.0.0' testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13' + testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0' - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.0-eap13" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0" } dokka { diff --git a/tests/build.gradle b/tests/build.gradle index 70c6c27c..f3eafda4 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -1,10 +1,9 @@ buildscript { ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7' - ext.kotlin_version = '1.3.0-rc-116' + ext.kotlin_version = '1.3.0' repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -17,14 +16,13 @@ apply plugin: 'kotlin' repositories { mavenCentral() jcenter() - maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${rootProject.ext.versionName}.jar") compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.mockito:mockito-core:2.19.0" + compile "org.mockito:mockito-core:2.23.0" testCompile "junit:junit:4.12" testCompile "com.nhaarman:expect.kt:1.0.0"