Skip to content

Commit 5547283

Browse files
Merge branch 'lib-updates' into dev
2 parents 5101ac8 + df982e9 commit 5547283

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
5454
}
5555

5656
dependencies {
57-
deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2'
58-
deployerJars 'org.apache.maven.wagon:wagon-ftp:2.2'
57+
deployerJars 'org.apache.maven.wagon:wagon-webdav-jackrabbit:3.3.2'
58+
deployerJars 'org.apache.maven.wagon:wagon-ftp:3.3.2'
5959
}
6060

6161
signing {

objectbox-kotlin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version= rootProject.version
33

44
buildscript {
55
ext.javadocDir = "$buildDir/docs/javadoc"
6-
ext.kotlin_version = '1.3.20'
6+
ext.kotlin_version = '1.3.21'
77
ext.dokka_version = '0.9.17'
88

99
repositories {

objectbox-rxjava/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ sourceCompatibility = 1.7
77

88
dependencies {
99
compile project(':objectbox-java')
10-
compile 'io.reactivex.rxjava2:rxjava:2.1.16'
10+
compile 'io.reactivex.rxjava2:rxjava:2.2.7'
1111

1212
testCompile 'junit:junit:4.12'
13-
testCompile 'org.mockito:mockito-core:2.19.0'
13+
testCompile 'org.mockito:mockito-core:2.25.1'
1414
}
1515

1616
javadoc {

0 commit comments

Comments
 (0)