Skip to content

Commit da6359d

Browse files
greenrobot-teamgreenrobot-team
committed
Merge branch 'updates' into dev
2 parents 55ea65e + 3582d67 commit da6359d

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objectbox-kotlin/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version= rootProject.version
33

44
buildscript {
55
ext.javadocDir = "$buildDir/docs/javadoc"
6-
ext.kotlin_version = '1.3.31'
7-
ext.dokka_version = '0.10.0'
6+
ext.kotlin_version = '1.3.61'
7+
ext.dokka_version = '0.10.1'
88

99
repositories {
1010
mavenCentral()

‎objectbox-rxjava/build.gradle‎

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

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

1212
testCompile "junit:junit:$junit_version"
13-
testCompile 'org.mockito:mockito-core:2.25.1'
13+
// Mockito 3.x requires Java 8.
14+
testCompile 'org.mockito:mockito-core:2.28.2'
1415
}
1516

1617
task javadocJar(type: Jar, dependsOn: javadoc) {

0 commit comments

Comments
 (0)