Merge pull request #336 from SwissBitcoinPay/upgrade-to-android-15

Upgrade to android 15

Author: SwissBitcoinPay

.env

@@ -1,2 +1,2 @@
-APP_VERSION=2.5.26
-APP_BUILD_NUMBER=459
+APP_VERSION=2.5.27
+APP_BUILD_NUMBER=462

.gitignore

@@ -66,6 +66,7 @@ local.properties
 *.keystore
 *.android.bundle
 android/app/src/main/res/drawable-mdpi
+.kotlin/
 
 
 # VS Code

.nvmrc

@@ -0,0 +1 @@
+20.19.4

.prettierrc

@@ -1,6 +1,6 @@
 {
-    "bracketSpacing": true,
-    "jsxBracketSameLine": false,
-    "singleQuote": false,
-    "trailingComma": "none"
-}
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "singleQuote": false,
+  "trailingComma": "none"
+}

Gemfile

@@ -2,9 +2,15 @@ source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
- 
+
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 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'
+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'

android/app/build.gradle

@@ -73,14 +73,14 @@ def enableProguardInReleaseBuilds = true
  * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 /**
  * Private function to get the list of Native Architectures you want to build.

android/app/src/debug/AndroidManifest.xml

@@ -38,6 +38,7 @@
       android:largeHeap="true"
       android:hardwareAccelerated="true"
       android:theme="@style/AppTheme"
+      android:usesCleartextTraffic="${usesCleartextTraffic}"
       android:supportsRtl="true">
       <profileable android:shell="true" />
       <activity

android/app/src/main/AndroidManifest.xml

@@ -4,13 +4,11 @@ import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 import ch.swissbitcoinpay.checkout.BitBoxBridgePackage
 
 class MainApplication : Application(), ReactApplication {
@@ -37,10 +35,6 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+    loadReactNative(this)
   }
 }

android/app/src/main/java/ch/swissbitcoinpay/checkout/MainApplication.kt

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 26
-        compileSdkVersion = 35
-        targetSdkVersion = 34
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
 
         androidXAnnotation = "1.2.0"
         androidXBrowser = "1.3.0"