Skip to content

Commit da6359d

Browse files
Merge branch 'updates' into dev
2 parents 55ea65e + 3582d67 commit da6359d

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed
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
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# https://www.apache.org/licenses/LICENSE-2.0
1111
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@rem you may not use this file except in compliance with the License.
66
@rem You may obtain a copy of the License at
77
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
99
@rem
1010
@rem Unless required by applicable law or agreed to in writing, software
1111
@rem distributed under the License is distributed on an "AS IS" BASIS,

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)