Merge branch 'publish' into dev

Author: greenrobot-team

CHANGELOG.md

@@ -4,12 +4,13 @@ Notable changes to the ObjectBox Java library.
 
 For more insights into what changed in the ObjectBox C++ core, [check the ObjectBox C changelog](https://github.com/objectbox/objectbox-c/blob/main/CHANGELOG.md).
 
-## 4.1.1 - in development
+## 4.2.0 - 2025-03-04
 
 - Add new query conditions `equalKeyValue`, `greaterKeyValue`, `lessKeyValue`, `lessOrEqualKeyValue`, and 
   `greaterOrEqualKeyValue` that are helpful to write complex queries for [string maps](https://docs.objectbox.io/advanced/custom-types#flex-properties).
   These methods support `String`, `long` and `double` data types for the values in the string map.
 - Deprecate the `containsKeyValue` condition, use the new `equalKeyValue` condition instead.
+- Android: to build, at least Android Plugin 8.1.1 and Gradle 8.2.1 are required.
 
 ## 4.1.0 - 2025-01-30
 

README.md

@@ -77,7 +77,7 @@ For Android projects, add the ObjectBox Gradle plugin to your root `build.gradle
 
 ```groovy
 buildscript {
-    ext.objectboxVersion = "4.1.0"
+    ext.objectboxVersion = "4.2.0"
     repositories {        
         mavenCentral()    
     }

build.gradle.kts

@@ -13,19 +13,19 @@ plugins {
 }
 
 buildscript {
-    // To publish a release, typically, only edit those two:
-    val objectboxVersionNumber = "4.1.1" // without "-SNAPSHOT", e.g. "2.5.0" or "2.4.0-RC"
-    val objectboxVersionRelease =
-        false // set to true for releasing to ignore versionPostFix to avoid e.g. "-dev" versions
+    val versionNumber = "4.2.0" // without "-SNAPSHOT", e.g. "2.5.0" or "2.4.0-RC"
+    val isRelease = true        // WARNING: only set true to publish a release on publish branch!
+                                // See the release checklist for details.
+                                // Makes this produce release artifacts, changes dependencies to release versions.
 
     // version post fix: "-<value>" or "" if not defined; e.g. used by CI to pass in branch name
     val versionPostFixValue = project.findProperty("versionPostFix")
     val versionPostFix = if (versionPostFixValue != null) "-$versionPostFixValue" else ""
-    val obxJavaVersion by extra(objectboxVersionNumber + (if (objectboxVersionRelease) "" else "$versionPostFix-SNAPSHOT"))
+    val obxJavaVersion by extra(versionNumber + (if (isRelease) "" else "$versionPostFix-SNAPSHOT"))
 
     // Native library version for tests
     // Be careful to diverge here; easy to forget and hard to find JNI problems
-    val nativeVersion = objectboxVersionNumber + (if (objectboxVersionRelease) "" else "-dev-SNAPSHOT")
+    val nativeVersion = versionNumber + (if (isRelease) "" else "-dev-SNAPSHOT")
     val osName = System.getProperty("os.name").lowercase()
     val objectboxPlatform = when {
         osName.contains("linux") -> "linux"
@@ -54,8 +54,8 @@ buildscript {
     // prevent uploading from branches other than publish, and main (for which uploading is turned off).
     val isCI = System.getenv("CI") == "true"
     val branchOrTag = System.getenv("CI_COMMIT_REF_NAME")
-    if (isCI && objectboxVersionRelease && !("publish" == branchOrTag || "main" == branchOrTag)) {
-        throw GradleException("objectboxVersionRelease = true is only allowed on branch publish or main")
+    if (isCI && isRelease && !("publish" == branchOrTag || "main" == branchOrTag)) {
+        throw GradleException("isRelease = true is only allowed on branch publish or main")
     }
 
     repositories {

objectbox-java/build.gradle

@@ -81,6 +81,7 @@ tasks.register('javadocForWeb', Javadoc) {
     destinationDir = file(javadocForWebDir)
 
     title = "ObjectBox Java ${version} API"
+    options.encoding = 'UTF-8' // Set UTF-8 encoding to support unicode characters used in docs
     options.overview = "$projectDir/src/web/overview.html"
     options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2017-2024 <a href="https://objectbox.io/">ObjectBox Ltd</a>. All Rights Reserved.</i>'
 

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -73,11 +73,14 @@ public class BoxStore implements Closeable {
     /** Prefix supplied with database directory to signal a file-less and in-memory database should be used. */
     public static final String IN_MEMORY_PREFIX = "memory:";
 
-    /** ReLinker uses this as a suffix for the extracted shared library file. If different, it will update it. */
-    public static final String JNI_VERSION = "4.1.0-2025-01-30";
+    /**
+     * ReLinker uses this as a suffix for the extracted shared library file. If different, it will update it. Should be
+     * unique to avoid conflicts.
+     */
+    public static final String JNI_VERSION = "4.2.0-2025-03-04";
 
-    /** The native or core version of ObjectBox the Java library is known to work with. */
-    private static final String VERSION = "4.1.0-2025-01-30";
+    /** The ObjectBox database version this Java library is known to work with. */
+    private static final String VERSION = "4.2.0-2025-03-04";
     private static BoxStore defaultStore;
 
     /** Currently used DB dirs with values from {@link #getCanonicalPath(File)}. */