wix
diff --git a/‎.gitignore‎
Lines changed: 9 additions & 3 deletions b/‎.gitignore‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎Gemfile‎
Lines changed: 5 additions & 4 deletions b/‎Gemfile‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎android/app/build.gradle‎
Lines changed: 10 additions & 8 deletions b/‎android/app/build.gradle‎
Lines changed: 10 additions & 8 deletions
diff --git a/‎android/app/src/main/AndroidManifest.xml‎
Lines changed: 2 additions & 1 deletion b/‎android/app/src/main/AndroidManifest.xml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎android/app/src/main/java/com/rnuilib/MainApplication.kt‎
Lines changed: 3 additions & 12 deletions b/‎android/app/src/main/java/com/rnuilib/MainApplication.kt‎
Lines changed: 3 additions & 12 deletions
diff --git a/‎android/app/src/main/java/com/rnuilib/MainApplicationReactNativeHost.java‎
Lines changed: 0 additions & 54 deletions b/‎android/app/src/main/java/com/rnuilib/MainApplicationReactNativeHost.java‎
Lines changed: 0 additions & 54 deletions
diff --git a/‎android/app/src/main/res/drawable/rn_edit_text_material.xml‎
Lines changed: 2 additions & 1 deletion b/‎android/app/src/main/res/drawable/rn_edit_text_material.xml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎android/build.gradle‎
Lines changed: 5 additions & 5 deletions b/‎android/build.gradle‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎android/gradle.properties‎
Lines changed: 1 addition & 2 deletions b/‎android/gradle.properties‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎android/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion b/‎android/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion
@@ -21,7 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-ios/.xcode.env.local
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -43,11 +43,17 @@ expoDemo/android/gradlew.bat
 node_modules/
 npm-debug.log
 
-# yarn
+# Yarn
+.yarn/*
 yarn-error.log
 **/.yarn/cache
 **/.yarn/install-state.gz
 **/.yarn/yarn.build.json
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
 .vscode
 
@@ -74,7 +80,7 @@ docs/components/**
 !scripts/build
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
 /ios/Podfile.lock
 expoDemo/ios/Pods
 
@@ -3,8 +3,9 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# 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'
 
@@ -13,14 +13,16 @@ apply plugin: "com.facebook.react"
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
     root = file("../../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
+//   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
     reactNativeDir = file("../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
+
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
@@ -51,6 +53,8 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+    
+    /* Autolinking */
     autolinkLibrariesWithApp()
 }
 
@@ -122,7 +126,6 @@ android {
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")    
-    implementation("com.facebook.react:flipper-integration:0.73.9")
 
     implementation project(':react-native-navigation')
     implementation 'com.facebook.fresco:fresco:2.5.0'
@@ -135,4 +138,3 @@ dependencies {
     }
 }
 
-// apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 
@@ -8,7 +8,8 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
 
@@ -9,7 +9,7 @@ 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.flipper.ReactNativeFlipper
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 import com.reactnativenavigation.NavigationApplication
 import com.wix.reactnativeuilib.UiLibPackageList;
@@ -35,15 +35,6 @@ class MainApplication : NavigationApplication() {
       }
 
   override val reactHost: ReactHost
-    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
-
-  override fun onCreate() {
-    super.onCreate()
-    SoLoader.init(this, false)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
-    ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
-  }
+    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+    
 }
@@ -2,24 +2,9 @@
 import android.app.Application;
 import androidx.annotation.NonNull;
 import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.EmptyReactNativeConfig;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import com.rnuilib.BuildConfig;
-import java.util.ArrayList;
 import java.util.List;
 /**
  * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
@@ -59,43 +44,4 @@ protected String getJSMainModuleName() {
         // for the new architecture and to use TurboModules correctly.
         return new MainApplicationTurboModuleManagerDelegate.Builder();
     }
-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-        return new JSIModulePackage() {
-            @Override
-            public List<JSIModuleSpec> getJSIModules(
-                    final ReactApplicationContext reactApplicationContext,
-                    final JavaScriptContextHolder jsContext) {
-                final List<JSIModuleSpec> specs = new ArrayList<>();
-                // Here we provide a new JSIModuleSpec that will be responsible of providing the
-                // custom Fabric Components.
-                specs.add(
-                        new JSIModuleSpec() {
-                            @Override
-                            public JSIModuleType getJSIModuleType() {
-                                return JSIModuleType.UIManager;
-                            }
-                            @Override
-                            public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                                final ComponentFactory componentFactory = new ComponentFactory();
-                                CoreComponentsRegistry.register(componentFactory);
-                                // Here we register a Components Registry.
-                                // The one that is generated with the template contains no components
-                                // and just provides you the one from React Native core.
-                                MainComponentsRegistry.register(componentFactory);
-                                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-                                ViewManagerRegistry viewManagerRegistry =
-                                        new ViewManagerRegistry(
-                                                reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
-                                return new FabricJSIModuleProvider(
-                                        reactApplicationContext,
-                                        componentFactory,
-                                        new EmptyReactNativeConfig(),
-                                        viewManagerRegistry);
-                            }
-                        });
-                return specs;
-            }
-        };
-    }
 }
@@ -14,7 +14,8 @@
        android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
        android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
        android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
+       >
     <selector>
         <!-- 
           This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
 
@@ -2,12 +2,12 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
+        buildToolsVersion = "35.0.0"
         minSdkVersion = 26
-        compileSdkVersion = 34
+        compileSdkVersion = 35
         targetSdkVersion = 34
-        RNNKotlinVersion = "1.8.22"
-        ndkVersion = "25.1.8937393"
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         mavenLocal()
@@ -19,7 +19,7 @@ buildscript {
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
 
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 
@@ -18,7 +18,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # org.gradle.parallel=true
 
 android.useAndroidX=true
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -29,7 +28,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME