Merge branch 'dev-latest' into sync

Author: greenrobot-team

Jenkinsfile

@@ -54,7 +54,7 @@ pipeline {
                         "--tests io.objectbox.FunctionalTestSuite " +
                         "--tests io.objectbox.test.proguard.ObfuscatedEntityTest " +
                         "--tests io.objectbox.rx.QueryObserverTest " +
-                        "assemble"
+                        "spotbugsMain assemble"
             }
         }
 
@@ -92,7 +92,7 @@ pipeline {
         always {
             junit '**/build/test-results/**/TEST-*.xml'
             archiveArtifacts artifacts: 'tests/*/hs_err_pid*.log', allowEmptyArchive: true  // Only on JVM crash.
-            // currently unused: archiveArtifacts '**/build/reports/findbugs/*'
+            recordIssues(tool: spotBugs(pattern: '**/build/reports/spotbugs/*.xml', useRankAsPriority: true))
 
             googlechatnotification url: 'id:gchat_java', message: "${currentBuild.currentResult}: ${currentBuild.fullDisplayName}\n${env.BUILD_URL}",
                                    notifyFailure: 'true', notifyUnstable: 'true', notifyBackToNormal: 'true'

build.gradle

@@ -1,6 +1,3 @@
-// Just too many sub projects, so each can reference rootProject.version
-version = ob_version
-
 buildscript {
     ext {
         // Typically, only edit those two:
@@ -11,32 +8,40 @@ buildscript {
         def versionPostFixValue = project.findProperty('versionPostFix')
         def versionPostFix = versionPostFixValue ? "-$versionPostFixValue" : ''
         ob_version = objectboxVersionNumber + (objectboxVersionRelease? "" : "$versionPostFix-SNAPSHOT")
-        println "ObjectBox Java version $ob_version"
-
-        ob_expected_version = project.hasProperty('expectedVersion') ? project.property('expectedVersion') : 'UNDEFINED'
 
-        // Core version for tests
+        // Native library version for tests
         // Be careful to diverge here; easy to forget and hard to find JNI problems
-        ob_native_version = objectboxVersionNumber + (objectboxVersionRelease? "": "-dev-SNAPSHOT")
-
+        def nativeVersion = objectboxVersionNumber + (objectboxVersionRelease? "": "-dev-SNAPSHOT")
         def osName = System.getProperty("os.name").toLowerCase()
-        objectboxPlatform = osName.contains('linux') ? 'linux'
+        def objectboxPlatform = osName.contains('linux') ? 'linux'
                 : osName.contains("windows")? 'windows'
                 : osName.contains("mac")? 'macos'
                 : 'unsupported'
+        ob_native_dep = "io.objectbox:objectbox-$objectboxPlatform:$nativeVersion"
 
-        objectboxNativeDependency = "io.objectbox:objectbox-$objectboxPlatform:$ob_native_version"
-        println "ObjectBox native dependency: $objectboxNativeDependency"
+        junit_version = '4.13'
+
+        println "version=$ob_version"
+        println "objectboxNativeDependency=$ob_native_dep"
     }
-    ext.junit_version = '4.13'
 
     repositories {
         mavenCentral()
         jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+
+    dependencies {
+        classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.0.5"
     }
 }
 
 allprojects {
+    group = 'io.objectbox'
+    version = ob_version
+
     repositories {
         mavenCentral()
         jcenter()
@@ -95,34 +100,41 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
 
                     if (preferredRepo == 'local') {
                         repository url: repositories.mavenLocal().url
-                    } else if (preferredRepo != null 
+                        println "Uploading archives to mavenLocal()."
+                    } else if (preferredRepo != null
                             && project.hasProperty('preferredUsername') 
                             && project.hasProperty('preferredPassword')) {
                         configuration = configurations.deployerJars
+
                         // replace placeholders
                         def repositoryUrl = preferredRepo
                                 .replace('__groupId__', project.group)
                                 .replace('__artifactId__', project.archivesBaseName)
                         repository(url: repositoryUrl) {
                             authentication(userName: preferredUsername, password: preferredPassword)
                         }
-                    } else if (project.hasProperty('sonatypeUsername') 
+
+                        println "Uploading archives to $repositoryUrl."
+                    } else if (project.hasProperty('sonatypeUsername')
                             && project.hasProperty('sonatypePassword')) {
                         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
                         def isSnapshot = version.endsWith('-SNAPSHOT')
-                        def sonatypeRepositoryUrl = isSnapshot ?
-                                "https://oss.sonatype.org/content/repositories/snapshots/"
+                        def sonatypeRepositoryUrl = isSnapshot
+                                ? "https://oss.sonatype.org/content/repositories/snapshots/"
                                 : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
                         repository(url: sonatypeRepositoryUrl) {
                             authentication(userName: sonatypeUsername, password: sonatypePassword)
                         }
+
+                        println "Uploading archives to $sonatypeRepositoryUrl."
                     } else {
-                        println "Deployment settings missing/incomplete for ${project.name}."
+                        println "WARNING: preferredRepo NOT set, can not upload archives."
                     }
 
                     pom.project {
                         packaging 'jar'
-                        url 'http://objectbox.io'
+                        url 'https://objectbox.io'
 
                         scm {
                             url 'https://github.com/objectbox/objectbox-java'
@@ -144,7 +156,7 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
 
                         organization {
                             name 'ObjectBox Ltd.'
-                            url 'http://objectbox.io'
+                            url 'https://objectbox.io'
                         }
                     }
                 }
@@ -153,36 +165,6 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
     }
 }
 
-// this task is also used by the composite build ('objectbox-deploy'), check before making changes
-task installAll {
-    group 'deploy'
-    dependsOn ':objectbox-java-api:install'
-    dependsOn ':objectbox-java:install'
-    dependsOn ':objectbox-kotlin:install'
-    dependsOn ':objectbox-rxjava:install'
-    doLast {
-        println("Installed version $version")
-    }
-}
-
-// this task is also used by the composite build ('objectbox-deploy'), check before making changes
-task deployAll {
-    group 'deploy'
-    dependsOn ':objectbox-java-api:uploadArchives'
-    dependsOn ':objectbox-java:uploadArchives'
-    dependsOn ':objectbox-kotlin:uploadArchives'
-    dependsOn ':objectbox-rxjava:uploadArchives'
-}
-
-// this task is also used by the composite build ('objectbox-deploy'), check before making changes
-task verifyVersion {
-    group 'verify'
-    dependsOn ':objectbox-java:verifyVersion'
-    doLast {
-        assert ob_expected_version == version
-    }
-}
-
 wrapper {
     distributionType = Wrapper.DistributionType.ALL
 }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

gradlew.bat

@@ -1,9 +1,7 @@
 apply plugin: 'java'
 
-group = 'io.objectbox'
-version= rootProject.version
-
-sourceCompatibility = 1.7
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'

objectbox-java-api/build.gradle

@@ -30,5 +30,5 @@
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-/** TODO public */ @interface NotNull {
+/* TODO public */ @interface NotNull {
 }

objectbox-java-api/src/main/java/io/objectbox/annotation/NotNull.java

@@ -28,7 +28,7 @@
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.FIELD)
-/** TODO public */ @interface OrderBy {
+/* TODO public */ @interface OrderBy {
     /**
      * Comma-separated list of properties, e.g. "propertyA, propertyB, propertyC"
      * To specify direction, add ASC or DESC after property name, e.g.: "propertyA DESC, propertyB ASC"

objectbox-java-api/src/main/java/io/objectbox/annotation/OrderBy.java

@@ -1,18 +1,8 @@
 apply plugin: 'java'
-apply plugin: 'findbugs'
+apply plugin: "com.github.spotbugs"
 
-group = 'io.objectbox'
-version= rootProject.version
-
-sourceCompatibility = '1.7'
-
-tasks.withType(FindBugs) {
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
-    ignoreFailures = true
-}
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
@@ -22,6 +12,10 @@ dependencies {
     compile 'com.google.code.findbugs:jsr305:3.0.2'
 }
 
+spotbugs {
+    ignoreFailures = true
+}
+
 javadoc {
     // Hide internal API from javadoc artifact.
     exclude("**/io/objectbox/Cursor.java")
@@ -142,23 +136,3 @@ uploadArchives {
         }
     }
 }
-
-// this task is also used by the composite build ('objectbox-deploy'), check before making changes
-task verifyVersion {
-    group 'verify'
-    doLast {
-        // verify version in Boxstore.java
-        File storeFile = file('src/main/java/io/objectbox/BoxStore.java')
-        def versionLine = storeFile.filterLine { line ->
-            line.contains("String VERSION =")
-        }.toString()
-
-        if (versionLine == null || versionLine.empty) {
-            throw new GradleException('Could not find VERSION in ObjectStore.cpp')
-        }
-
-        // matches snippet like '12.34.56'
-        def boxStoreVersion = versionLine.find("\\d+\\.\\d+\\.\\d+")
-        assert ob_expected_version == boxStoreVersion
-    }
-}