Merge branch 'updates' into dev

Author: greenrobot-team

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

objectbox-kotlin/build.gradle

@@ -3,8 +3,8 @@ version= rootProject.version
 
 buildscript {
     ext.javadocDir = "$buildDir/docs/javadoc"
-    ext.kotlin_version = '1.3.31'
-    ext.dokka_version = '0.10.0'
+    ext.kotlin_version = '1.3.61'
+    ext.dokka_version = '0.10.1'
 
     repositories {
         mavenCentral()

objectbox-rxjava/build.gradle

@@ -7,10 +7,11 @@ sourceCompatibility = 1.7
 
 dependencies {
     compile project(':objectbox-java')
-    compile 'io.reactivex.rxjava2:rxjava:2.2.9'
+    compile 'io.reactivex.rxjava2:rxjava:2.2.18'
 
     testCompile "junit:junit:$junit_version"
-    testCompile 'org.mockito:mockito-core:2.25.1'
+    // Mockito 3.x requires Java 8.
+    testCompile 'org.mockito:mockito-core:2.28.2'
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {