Skip to content
This repository has been archived by the owner on Dec 7, 2019. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
plastiv committed Feb 21, 2019
1 parent a15e3a4 commit b3b6ef2
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 17 deletions.
1 change: 0 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 7 additions & 8 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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',
]

Expand All @@ -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",
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 " "
}
Expand Down
1 change: 0 additions & 1 deletion os/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apply from: '../gradle/publishing.gradle'

dependencies {
compile libraries.kotlinStd
compile libraries.kotlinRuntime
compile libraries.kotlinReflect
compile libraries.rxJava
}
Expand Down

0 comments on commit b3b6ef2

Please sign in to comment.