Skip to content

Commit 04beb35

Browse files
mostroverkhovrobertroeser
authored andcommitted
Attempt to fix bintray release & library versions update (#38)
1 parent ee21848 commit 04beb35

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id "com.gradle.build-scan" version "1.12.1"
1919
id 'com.jfrog.bintray' version '1.7.3' apply false
2020
id 'com.jfrog.artifactory' version '4.7.1' apply false
21-
id "org.jetbrains.kotlin.jvm" version "1.2.41" apply false
21+
id "org.jetbrains.kotlin.jvm" version "1.2.50" apply false
2222
}
2323

2424
subprojects {
@@ -56,15 +56,15 @@ subprojects {
5656
}
5757

5858
dependencies {
59-
api "io.netty:netty-buffer:4.1.24.Final"
59+
api "io.netty:netty-buffer:4.1.25.Final"
6060
api "org.reactivestreams:reactive-streams:1.0.2"
6161
api "com.google.code.findbugs:jsr305:3.0.2"
62-
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41"
63-
api 'io.reactivex.rxjava2:rxjava:2.1.13'
62+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50"
63+
api 'io.reactivex.rxjava2:rxjava:2.1.15'
6464
api "org.slf4j:slf4j-api:1.7.25"
6565

6666
testImplementation "junit:junit:4.12"
67-
testImplementation "org.mockito:mockito-core:2.18.3"
67+
testImplementation "org.mockito:mockito-core:2.19.0"
6868
testImplementation "org.hamcrest:hamcrest-library:1.3"
6969
testImplementation "org.slf4j:slf4j-log4j12:1.7.25"
7070
}

gradle/buildViaTravis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
99
./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build artifactoryPublish --stacktrace
1010
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
1111
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
12-
./gradlew -Pmavenversion="$TRAVIS_TAG" -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build bintrayUpload --stacktrace
12+
./gradlew -Pversion="$TRAVIS_TAG" -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build bintrayUpload --stacktrace
1313
else
1414
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
1515
./gradlew build

0 commit comments

Comments
 (0)