Merge pull request #275 from OP-Engineering/oscar/android-16kb-pages

Support Android 16kb pages

Author: ospfranco

.gitignore

@@ -41,6 +41,7 @@ local.properties
 example/.cxx/
 *.keystore
 !debug.keystore
+.kotlin/
 
 # Bundle
 #

android/build.gradle

@@ -116,7 +116,7 @@ def reactNativeArchitectures() {
 
 android {
 
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
+  compileSdkVersion safeExtGet("compileSdkVersion", 35)
   namespace "com.op.sqlite"
 
   // Used to override the NDK path/version on internal CI or by allowing
@@ -191,7 +191,8 @@ android {
               "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
               "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}",
               "-DUSER_DEFINED_SOURCE_FILES=${sourceFiles}",
-              "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'"
+              "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'",
+              "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
         }
     }
 

android/gradle.properties

@@ -1 +1 @@
-OPSQLite_kotlinVersion=1.9.22
+OPSQLite_kotlinVersion=2.0.21

example/Gemfile

@@ -2,7 +2,13 @@ source 'https://rubygems.org'
 
 ruby '>= 2.7.6'
 
-gem 'cocoapods', '=1.16.2'
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+ 
+# Ruby 3.4.0 has removed some libraries from the standard library.
 gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
 gem 'mutex_m'

example/Gemfile.lock

@@ -17,12 +17,13 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.5)
     claide (1.1.0)
-    cocoapods (1.16.2)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.2)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,8 +37,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.27.0, < 2.0)
-    cocoapods-core (1.16.2)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -69,36 +70,41 @@ GEM
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     json (2.9.1)
+    logger (1.7.0)
     minitest (5.22.3)
     molinillo (0.8.0)
     mutex_m (0.2.0)
-    nanaimo (0.4.0)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.4.0)
+    rexml (3.4.1)
     ruby-macho (2.5.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
+      nanaimo (~> 0.3.0)
       rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (>= 6.1.7.5, != 7.1.0)
+  benchmark
   bigdecimal
-  cocoapods (= 1.16.2)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
+  concurrent-ruby (< 1.3.4)
+  logger
   mutex_m
+  xcodeproj (< 1.26.0)
 
 RUBY VERSION
    ruby 3.3.1p55

example/android/build.gradle

@@ -3,9 +3,9 @@ buildscript {
         buildToolsVersion = "35.0.0"
         minSdkVersion = 24
         compileSdkVersion = 35
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

example/ios/Podfile

@@ -1,5 +1,8 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+    "react-native/scripts/react_native_pods.rb",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
@@ -20,16 +23,6 @@ target 'OPSQLiteExample' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  # pre_install do |installer|
-  #   installer.pod_targets.each do |pod|
-  #     if pod.name.eql?('op-sqlite')
-  #       def pod.build_type
-  #         Pod::BuildType.static_library
-  #       end
-  #     end
-  #   end
-  # end
-
   post_install do |installer|
     # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(