Merge branch 'release/1.0' of github.com:pavjacko/renative into feat/…

…upgrade_to_rn73
flexn-io · Feb 6, 2024 · fe8aae0 · fe8aae0
2 parents 6364615 + b01c7b5
commit fe8aae0
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/packages/engine-rn-macos/templates/platforms/macos/Podfile b/packages/engine-rn-macos/templates/platforms/macos/Podfile
@@ -1,5 +1,5 @@
 {{PLUGIN_PODFILE_SOURCES}}
-platform :macos, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+platform :macos, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'
 {{PLUGIN_WARNINGS}}
 
 # ReNative: To allow dynamic plugins via flavours autolinking has to be disabled

diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/gradle.properties b/packages/engine-rn-tvos/templates/platforms/androidtv/gradle.properties
@@ -41,7 +41,7 @@ newArchEnabled={{NEW_ARCH_ENABLED}}
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled={{HERMES_ENABLED}}
+hermesEnabled={{INJECT_HERMES_ENABLED}}
 
 # ACTUALS
 # HARDCODED

diff --git a/packages/engine-rn-tvos/templates/platforms/firetv/gradle.properties b/packages/engine-rn-tvos/templates/platforms/firetv/gradle.properties
@@ -41,7 +41,7 @@ newArchEnabled={{NEW_ARCH_ENABLED}}
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled={{HERMES_ENABLED}}
+hermesEnabled={{INJECT_HERMES_ENABLED}}
 
 # ACTUALS
 # HARDCODED

diff --git a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile
@@ -20,7 +20,7 @@ end
 
 target 'RNVApp' do
   config = use_native_modules!
-  platform :ios, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+  platform :ios, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'
 
   use_react_native!(
     :path => config[:reactNativePath],
@@ -29,6 +29,8 @@ target 'RNVApp' do
     # Note that if you have use_frameworks! enabled, Flipper will not work and
     # you should disable the next line.
     :flipper_configuration => flipper_config,
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    :hermes_enabled => {{INJECT_HERMES_ENABLED}},
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/../.."
   )
@@ -41,7 +43,7 @@ end
 
 target 'RNVApp-tvOS' do
   config = use_native_modules!
-  platform :tvos, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+  platform :tvos, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'
 
   use_react_native!(
     :path => config[:reactNativePath],
@@ -50,6 +52,8 @@ target 'RNVApp-tvOS' do
     # Note that if you have use_frameworks! enabled, Flipper will not work and
     # you should disable the next line.
     :flipper_configuration => flipper_config,
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    :hermes_enabled => {{INJECT_HERMES_ENABLED}},
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/../.."
   )

diff --git a/packages/engine-rn/templates/platforms/android/gradle.properties b/packages/engine-rn/templates/platforms/android/gradle.properties
@@ -41,7 +41,7 @@ newArchEnabled={{NEW_ARCH_ENABLED}}
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled={{HERMES_ENABLED}}
+hermesEnabled={{INJECT_HERMES_ENABLED}}
 
 # ACTUALS
 # HARDCODED

diff --git a/packages/engine-rn/templates/platforms/androidwear/gradle.properties b/packages/engine-rn/templates/platforms/androidwear/gradle.properties
@@ -42,7 +42,7 @@ newArchEnabled={{NEW_ARCH_ENABLED}}
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled={{HERMES_ENABLED}}
+hermesEnabled={{INJECT_HERMES_ENABLED}}
 
 # ACTUALS
 # HARDCODED

diff --git a/packages/engine-rn/templates/platforms/macos/Podfile b/packages/engine-rn/templates/platforms/macos/Podfile
@@ -1,5 +1,5 @@
 {{PLUGIN_PODFILE_SOURCES}}
-platform :ios, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+platform :ios, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'
 use_frameworks!
 {{PLUGIN_WARNINGS}}
 

diff --git a/packages/sdk-android/src/gradleParser.ts b/packages/sdk-android/src/gradleParser.ts
@@ -581,7 +581,7 @@ export const parseGradlePropertiesSync = (c: Context) => {
             override: newArchEnabled ? 'true' : 'false',
         },
         {
-            pattern: '{{HERMES_ENABLED}}',
+            pattern: '{{INJECT_HERMES_ENABLED}}',
             override: reactNativeEngine === 'hermes' ? 'true' : 'false',
         },
         {

diff --git a/spec/other/Podfile b/spec/other/Podfile
@@ -18,7 +18,7 @@ end
 
 target 'RNVApp' do
   config = use_native_modules!
-  platform :ios, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+  platform :ios, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'
 
 
 
@@ -38,7 +38,7 @@ end
 
 target 'RNVApp-tvOS' do
   config = use_native_modules!
-  platform :tvos, '{{PLUGIN_DEPLOYMENT_TARGET}}'
+  platform :tvos, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}'