react-native-navigation 8.6.1 → 8.6.2-snapshot.2147

package/ReactNativeNavigation.podspec

@@ -1,7 +1,10 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
+folly_compiler_flags = folly_flags()
+use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
+use_hermes_flag = use_hermes ? "-DUSE_HERMES=1" : ""
 
 Pod::Spec.new do |s|
   s.name         = "ReactNativeNavigation"
@@ -12,61 +15,33 @@ Pod::Spec.new do |s|
   s.authors      = "Wix.com"
   s.homepage     = package['homepage']
   s.license      = package['license']
-  s.platform     = :ios, "11.0"
+  s.platform     = :ios, min_ios_version_supported
 
   s.module_name  = 'ReactNativeNavigation'
-  s.default_subspec = 'Core'
-
-  s.subspec 'Core' do |ss|
-    s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files        = 'ios/**/*.{h,m,mm,cpp}'
-    s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
-    
-    s.public_header_files = [
-      'ios/RNNAppDelegate.h',
-      'ios/ReactNativeVersionExtracted.h'
-    ]
-  end
 
-  folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
+  s.source       = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
+  s.source_files = 'ios/**/*.{h,m,mm,cpp}'
+  s.exclude_files = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
 
-  # Base xcconfig settings
-  xcconfig_settings = {
-      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-  }
+  s.public_header_files = [
+    'ios/RNNAppDelegate.h',
+    'ios/ReactNativeVersionExtracted.h'
+  ]
 
-  xcconfig_settings["DEFINES_MODULE"] = "YES"
-  
-  s.pod_target_xcconfig = xcconfig_settings
+  # Add Folly compiler flags to prevent coroutines header issues
+  # Add Hermes flag when using Hermes engine
+  s.compiler_flags = "#{folly_compiler_flags} #{use_hermes_flag}"
 
-  if fabric_enabled
-    install_modules_dependencies(s)
-
-    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED' + ' ' + '-DUSE_HERMES=1'
-    s.requires_arc    = true
+  # Add header search paths for React-Core private headers (needed for RCTCxxBridgeDelegate.h, etc.)
+  s.pod_target_xcconfig = {
+    'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/React-Core"',
+    'DEFINES_MODULE' => 'YES'
+  }
 
-    s.dependency "React"
-    s.dependency "React-RCTFabric"
-    s.dependency "React-cxxreact"
-    s.dependency "React-Fabric"
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon"
-    s.dependency "React-runtimeexecutor"
-    s.dependency "React-rncore"
-    s.dependency "React-RuntimeCore"
-  else
-    s.compiler_flags  = folly_compiler_flags
-  end
+  # Let install_modules_dependencies handle all React Native dependencies
+  install_modules_dependencies(s)
 
-  s.dependency 'React-Core'
-  s.dependency 'React-CoreModules'
-  s.dependency 'React-RCTImage'
-  s.dependency 'React-RCTText'
+  s.requires_arc = true
   s.dependency 'HMSegmentedControl'
   s.frameworks = 'UIKit'
 end

package/android/build.gradle

@@ -3,14 +3,14 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 buildscript {
     ext {
-        kotlinVersion = "1.9.24"
+        kotlinVersion = "2.1.20"
         RNNKotlinVersion = kotlinVersion
         detoxKotlinVersion = kotlinVersion
-        compileSdkVersion = 35
-        buildToolsVersion = "35.0.0"
+        compileSdkVersion = 36
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
+        targetSdkVersion = 36
+        ndkVersion = "27.1.12297006"
     }
 
     repositories {
@@ -50,12 +50,12 @@ def safeExtGetFallbackLowerBound(prop, fallback) {
     Math.max(safeExtGet(prop, fallback), fallback)
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 35
+def DEFAULT_COMPILE_SDK_VERSION = 36
 def DEFAULT_MIN_SDK_VERSION = 24
-def DEFAULT_TARGET_SDK_VERSION = 35
-def DEFAULT_KOTLIN_VERSION = "1.5.31"
+def DEFAULT_TARGET_SDK_VERSION = 36
+def DEFAULT_KOTLIN_VERSION = "2.1.20"
 def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
-def DEFAULT_BUILD_TOOLS_VERSION = "35.0.0"
+def DEFAULT_BUILD_TOOLS_VERSION = "36.0.0"
 def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
 def kotlinStdlib = safeExtGet('RNNKotlinStdlib', DEFAULT_KOTLIN_STDLIB)
 def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
@@ -144,7 +144,7 @@ dependencies {
     if ("Playground".toLowerCase() == rootProject.name.toLowerCase()) {
         // tests only for our playground
         testImplementation 'junit:junit:4.13.2'
-        testImplementation "org.robolectric:robolectric:4.14.1"
+        testImplementation "org.robolectric:robolectric:4.16"
         testImplementation 'org.assertj:assertj-core:3.11.1'
         testImplementation 'org.mockito:mockito-core:4.0.0'
         testImplementation 'com.squareup.assertj:assertj-android:1.2.0'