2.3.1 hotfix: allow 0.18.1 on Android

objectbox · Oct 2, 2023 · 9c020b7 · 9c020b7
1 parent 3a95d4b
commit 9c020b7
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 17 deletions.
diff --git a/flutter_libs/pubspec.yaml b/flutter_libs/pubspec.yaml
@@ -3,7 +3,7 @@ description: Superfast NoSQL Flutter / Dart database. This package contains Flut
 # Link to actual directory in repository so file links on pub.dev work.
 repository: https://github.com/objectbox/objectbox-dart/tree/main/flutter_libs
 homepage: https://objectbox.io
-version: 2.3.0
+version: 2.3.1
 
 environment:
   sdk: '>=2.14.0 <4.0.0'
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   # This is here just to ensure compatibility between objectbox-dart code and the libraries used
   # You should still depend on objectbox directly in your Flutter application.
-  objectbox: 2.3.0
+  objectbox: 2.3.1
   path_provider: ^2.0.0
 
 dev_dependencies:

diff --git a/generator/lib/src/version.dart b/generator/lib/src/version.dart
@@ -4,5 +4,5 @@ class Version {
   ///
   /// This string is updated by the /tool/set-version.sh script
   /// as part of the release process.
-  static const String current = "2.3.0";
+  static const String current = "2.3.1";
 }
diff --git a/generator/pubspec.yaml b/generator/pubspec.yaml
@@ -3,13 +3,13 @@ description: ObjectBox Flutter / Dart database binding code generator - finds an
 # Link to actual directory in repository so file links on pub.dev work.
 repository: https://github.com/objectbox/objectbox-dart/tree/main/generator
 homepage: https://objectbox.io
-version: 2.3.0
+version: 2.3.1
 
 environment:
   sdk: '>=2.18.0 <4.0.0'
 
 dependencies:
-  objectbox: 2.3.0
+  objectbox: 2.3.1
   analyzer: '>=5.2.0 <7.0.0' # 5.1.0 has a bug where DartType.element has been removed.
   build: ^2.0.0
   collection: ^1.15.0

diff --git a/objectbox/CHANGELOG.md b/objectbox/CHANGELOG.md
@@ -1,4 +1,6 @@
-## latest
+## 2.3.1 (2023-10-02)
+
+* Fix "Loaded ObjectBox core dynamic library has unsupported version 0.18.1" on Android
 
 ## 2.3.0 (2023-09-19)
 

diff --git a/objectbox/example/flutter/event_management_tutorial/event_manager/pubspec.yaml b/objectbox/example/flutter/event_management_tutorial/event_manager/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  objectbox: ^2.3.0
+  objectbox: ^2.3.1
   objectbox_flutter_libs: any
   intl: any
 

diff --git a/objectbox/example/flutter/event_management_tutorial/many_to_many/pubspec.yaml b/objectbox/example/flutter/event_management_tutorial/many_to_many/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  objectbox: ^2.3.0
+  objectbox: ^2.3.1
   objectbox_flutter_libs: any
   intl: any
 

diff --git a/objectbox/example/flutter/objectbox_demo/pubspec.yaml b/objectbox/example/flutter/objectbox_demo/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  objectbox: ^2.3.0
+  objectbox: ^2.3.1
   objectbox_flutter_libs: any
   intl: any
   path_provider: ^2.0.10

diff --git a/objectbox/example/flutter/objectbox_demo_relations/pubspec.yaml b/objectbox/example/flutter/objectbox_demo_relations/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  objectbox: ^2.3.0
+  objectbox: ^2.3.1
   objectbox_flutter_libs: any
   intl: any
   path_provider: ^2.0.10 # 2.0.11+ requires Flutter 2.8.0

diff --git a/objectbox/example/flutter/objectbox_demo_sync/pubspec.yaml b/objectbox/example/flutter/objectbox_demo_sync/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  objectbox: ^2.3.0
+  objectbox: ^2.3.1
   objectbox_sync_flutter_libs: any # For Sync support use this instead of objectbox_flutter_libs.
   intl: any
   path_provider: ^2.0.10

diff --git a/objectbox/lib/src/native/bindings/bindings.dart b/objectbox/lib/src/native/bindings/bindings.dart
@@ -92,8 +92,19 @@ ObjectBoxC? _tryObjectBoxLibFile() {
   return ObjectBoxC(_lib!);
 }
 
-bool _isSupportedVersion(ObjectBoxC obxc) => obxc.version_is_at_least(
-    OBX_VERSION_MAJOR, OBX_VERSION_MINOR, OBX_VERSION_PATCH);
+bool _isSupportedVersion(ObjectBoxC obxc) {
+  // Default: require "current" version exactly
+  var minMajor = OBX_VERSION_MAJOR;
+  var minMinor = OBX_VERSION_MINOR;
+  var minPatch = OBX_VERSION_PATCH;
+  // Special cases (if any):
+  if (Platform.isAndroid) {
+    minMajor = 0;
+    minMinor = 18;
+    minPatch = 1;
+  }
+  return obxc.version_is_at_least(minMajor, minMinor, minPatch);
+}
 
 ObjectBoxC loadObjectBoxLib() {
   ObjectBoxC? obxc;

diff --git a/objectbox/pubspec.yaml b/objectbox/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://objectbox.io
 # Link to actual directory in repository so file links on pub.dev work.
 repository: https://github.com/objectbox/objectbox-dart/tree/main/objectbox
 documentation: https://docs.objectbox.io
-version: 2.3.0
+version: 2.3.1
 
 environment:
   # minimum Dart SDK (also see generator and flutter_libs)

diff --git a/sync_flutter_libs/pubspec.yaml b/sync_flutter_libs/pubspec.yaml
@@ -3,7 +3,7 @@ description: Fast Flutter database for persisting Dart objects. This package con
 # Link to actual directory in repository so file links on pub.dev work.
 repository: https://github.com/objectbox/objectbox-dart/tree/main/sync_flutter_libs
 homepage: https://objectbox.io
-version: 2.3.0
+version: 2.3.1
 
 environment:
   sdk: '>=2.14.0 <4.0.0'
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   # This is here just to ensure compatibility between objectbox-dart code and the libraries used
   # You should still depend on objectbox directly in your Flutter application.
-  objectbox: 2.3.0
+  objectbox: 2.3.1
   path_provider: ^2.0.0
 
 dev_dependencies:

diff --git a/tool/publish.sh b/tool/publish.sh
@@ -7,7 +7,7 @@ msys=false
 case "$( uname )" in                #(
   MSYS* | MINGW* )  msys=true    ;; #(
 esac
-if [ $msys ]; then
+if [ "$msys" = true ]; then
   YQCMD="${root}/tool/yq_windows_amd64.exe"
 else
   YQCMD="${root}/tool/yq_linux_amd64"

diff --git a/tool/yq_linux_amd64 b/tool/yq_linux_amd64