Merge branch 'main' of github.com:fleetbase/storefront-app into app/oli-max

Author: roncodes

.github/workflows/react-native-ci.yml

@@ -50,6 +50,7 @@ buck-out/
 \.buckd/
 *.keystore
 !debug.keystore
+.kotlin/
 
 # testing
 /coverage

.gitignore

@@ -0,0 +1 @@
+v20.19.4

.nvmrc

@@ -64,21 +64,32 @@ def enableProguardInReleaseBuilds = false
  * 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.+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.storefront.app"
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = false
+        }
+    }
     defaultConfig {
         applicationId project.env.get("APP_IDENTIFIER") ?: "com.storefront.app"
         minSdkVersion rootProject.ext.minSdkVersion

.yarn/patches/react-native-i18n-npm-2.0.15-7f3cf7cee6.patch

@@ -1,26 +1,20 @@
 package com.storefront.app
 
 import android.app.Application
-import com.AlexanderZaytsev.RNI18n.RNI18nPackage
 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 com.lugg.RNCConfig.RNCConfigPackage
 
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
           object : DefaultReactNativeHost(this) {
-            override fun getPackages(): List<ReactPackage> =
-                    PackageList(this).packages.apply {
-                    }
+            override fun getPackages(): List<ReactPackage> = PackageList(this).packages.apply {}
 
             override fun getJSMainModuleName(): String = "index"
 
@@ -35,10 +29,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/build.gradle

@@ -0,0 +1,6 @@
+# Application.mk for Fleetbase Storefront App
+# This file configures the NDK build for the application
+
+# Enable support for 16 KB memory page sizes (required for Android 15+ devices)
+# This flag is supported by NDK r27 and higher
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

android/app/src/debug/AndroidManifest.xml

@@ -5,28 +5,24 @@ buildscript {
         playServicesLocationVersion = "21.0.1"
         firebaseMessagingVersion = "22.0.0"
         firebaseVersion = "22.0.0"
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
         appCompatVersion = "1.4.2"
     }
     repositories {
         google()
         mavenCentral()
-
-        maven {
-            url "https://jitpack.io" // Or the correct repository URL for Flipper
-        }
+        maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.4")
+        classpath("com.android.tools.build:gradle:8.6.0")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
         classpath('com.google.gms:google-services:4.3.15')
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
 

android/app/src/main/java/com/storefront/app/MainApplication.kt

@@ -26,6 +26,7 @@ android.useAndroidX=true
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
 reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+newArchEnabled=true
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
@@ -38,5 +39,10 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 hermesEnabled=true
 android.enableJetifier=true
 
-kotlin.compiler.jvmTarget=11
+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=false
+
+kotlin.compiler.jvmTarget=17
 kotlin.jvm.target.validation.mode=warning