improve and update build.gradle files, e.g. add buildscript.ext.objectboxNativeDependency

Author: greenrobot

build.gradle

@@ -7,22 +7,22 @@ buildscript {
         def versionPostFixValue = project.findProperty('versionPostFix')
         def versionPostFix = versionPostFixValue ? "-$versionPostFixValue" : ''
         ob_version = "2.4.0$versionPostFix-SNAPSHOT"
-        
+        println "ObjectBox Java version $ob_version"
+
+        ob_expected_version = project.hasProperty('expectedVersion') ? project.property('expectedVersion') : 'UNDEFINED'
+
         // Core version for tests
         // Be careful to diverge here; easy to forget and hard to find JNI problems
         ob_native_version = "2.4.0-dev-SNAPSHOT"
 
-        println "ObjectBox Java version $ob_version. Tests use Core version $ob_native_version."
-        
-        ob_expected_version = project.hasProperty('expectedVersion') ? project.property('expectedVersion') : 'UNDEFINED'
+        def osName = System.getProperty("os.name").toLowerCase()
+        objectboxPlatform = osName.contains('linux') ? 'linux'
+                : osName.contains("windows")? 'windows'
+                : osName.contains("mac")? 'macos'
+                : 'unsupported'
 
-        isLinux = System.getProperty("os.name").contains("Linux")
-        isMac = !isLinux && System.getProperty("os.name").toLowerCase().contains("mac")
-        isWin = System.getProperty("os.name").toLowerCase().contains("windows")
-        is64 = System.getProperty("sun.arch.data.model") == "64"
-        isLinux64 = isLinux && is64
-        isMac64 = isMac && is64
-        isWin64 = isWin && is64
+        objectboxNativeDependency = "io.objectbox:objectbox-$objectboxPlatform:$ob_native_version"
+        println "ObjectBox native dependency: $objectboxNativeDependency"
     }
 
     repositories {

objectbox-java-api/build.gradle

@@ -8,7 +8,7 @@ sourceCompatibility = 1.7
 javadoc {
     failOnError = false
     title = " ObjectBox API ${version} API"
-    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2017 <a href="http://objectbox.io/">ObjectBox Ltd</a>. All Rights Reserved.</i>'
+    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2017-2019 <a href="http://objectbox.io/">ObjectBox Ltd</a>. All Rights Reserved.</i>'
     doLast {
         copy {
             from '../javadoc-style'

objectbox-kotlin/build.gradle

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

objectbox-rxjava/build.gradle

@@ -7,7 +7,7 @@ sourceCompatibility = 1.7
 
 dependencies {
     compile project(':objectbox-java')
-    compile 'io.reactivex.rxjava2:rxjava:2.2.7'
+    compile 'io.reactivex.rxjava2:rxjava:2.2.9'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.25.1'
@@ -17,7 +17,7 @@ javadoc {
     failOnError = false
     title = "ObjectBox RxJava2 ${version} API"
     excludes = [] // Unfinished APIs if any
-    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2018 <a href="http://objectbox.io/">ObjectBox Ltd</a>. All Rights Reserved.</i>'
+    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2018-2019 <a href="http://objectbox.io/">ObjectBox Ltd</a>. All Rights Reserved.</i>'
     doLast {
         copy {
             from '../javadoc-style/'

tests/objectbox-java-test/build.gradle

@@ -27,13 +27,10 @@ dependencies {
 
     // Check flag to use locally compiled version to avoid dependency cycles
     if (!project.hasProperty('noObjectBoxTestDepencies') || !noObjectBoxTestDepencies) {
-        if (isLinux64) {
-            compile "io.objectbox:objectbox-linux:$ob_native_version"
-        } else if (isMac64) {
-            compile "io.objectbox:objectbox-macos:$ob_native_version"
-        } else if (isWin64) {
-            compile "io.objectbox:objectbox-windows:$ob_native_version"
-        }
+        println "Using $objectboxNativeDependency"
+        compile "$objectboxNativeDependency"
+    } else {
+        println "Did NOT add native dependency"
     }
 
     testCompile 'junit:junit:4.12'

tests/test-proguard/build.gradle

@@ -27,13 +27,10 @@ dependencies {
 
     // Check flag to use locally compiled version to avoid dependency cycles
     if (!project.hasProperty('noObjectBoxTestDepencies') || !noObjectBoxTestDepencies) {
-        if (isLinux64) {
-            compile "io.objectbox:objectbox-linux:$ob_native_version"
-        } else if (isMac64) {
-            compile "io.objectbox:objectbox-macos:$ob_native_version"
-        } else if (isWin64) {
-            compile "io.objectbox:objectbox-windows:$ob_native_version"
-        }
+        println "Using $objectboxNativeDependency"
+        compile "$objectboxNativeDependency"
+    } else {
+        println "Did NOT add native dependency"
     }
 
     testCompile 'junit:junit:4.12'