diff --git a/android/build.gradle b/android/build.gradle index 121e31c..52c9f6d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,6 @@ apply from: '../gradle/publishing.gradle' dependencies { compile libraries.os compile libraries.kotlinStd - compile libraries.kotlinRuntime compile libraries.kotlinReflect compile libraries.rxJava } diff --git a/build.gradle b/build.gradle index f1b0ec1..db77884 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" - classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' classpath "org.junit.platform:junit-platform-gradle-plugin:$versions.junitPlatform" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } diff --git a/ci/build.sh b/ci/build.sh index e19b061..d27492b 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -38,7 +38,7 @@ docker run \ --env BINTRAY_GPG_PASSPHRASE="$BINTRAY_GPG_PASSPHRASE" \ --volume `"pwd"`:/opt/project \ --rm \ -openjdk:8u121-jdk \ +openjdk:8u181-jdk \ bash -c "$BUILD_COMMAND" popd diff --git a/dependencies.gradle b/dependencies.gradle index df836f1..6e4f1c5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ ext.versions = [ - kotlin : '1.1.1', + kotlin : '1.3.21', - rxJava : '1.2.9', - jCommander : '1.66', - apacheCommonsIo : '2.5', - apacheCommonsLang: '3.5', + rxJava : '1.3.8', + jCommander : '1.71', + apacheCommonsIo : '2.6', + apacheCommonsLang: '3.8.1', junit : '4.12', - junitPlatform : '1.0.0-M3', - spek : '1.1.0', + junitPlatform : '1.0.0', + spek : '1.1.5', assertJ : '3.5.2', ] @@ -17,7 +17,6 @@ ext.libraries = [ android : project(':android'), kotlinStd : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin", - kotlinRuntime : "org.jetbrains.kotlin:kotlin-runtime:$versions.kotlin", kotlinReflect : "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin", rxJava : "io.reactivex:rxjava:$versions.rxJava", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2b265cc..91ca28c 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 59105ec..16d2805 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Apr 05 19:47:52 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 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/os/build.gradle b/os/build.gradle index 18ffc5f..75791e1 100644 --- a/os/build.gradle +++ b/os/build.gradle @@ -4,7 +4,6 @@ apply from: '../gradle/publishing.gradle' dependencies { compile libraries.kotlinStd - compile libraries.kotlinRuntime compile libraries.kotlinReflect compile libraries.rxJava }