Skip to content

feat(e2e-latest): enable New Architecture (RN 0.84) #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
abueide wants to merge 1 commit into
base: feat/devbox-e2e-latest
Choose a base branch
from
Draft

feat(e2e-latest): enable New Architecture (RN 0.84) #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/E2E-latest/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"

/**
Expand Down Expand Up @@ -122,5 +123,3 @@ dependencies {
implementation jscFlavor
}
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
10 changes: 4 additions & 6 deletions examples/E2E-latest/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@

buildscript {
ext {
def compileSdkEnv = System.getenv("ANDROID_COMPILE_SDK") ?: System.getenv("ANDROID_MAX_API") ?: "33"
def targetSdkEnv = System.getenv("ANDROID_TARGET_SDK") ?: System.getenv("ANDROID_MAX_API") ?: "33"
def compileSdkEnv = System.getenv("ANDROID_COMPILE_SDK") ?: System.getenv("ANDROID_MAX_API") ?: "36"
def targetSdkEnv = System.getenv("ANDROID_TARGET_SDK") ?: System.getenv("ANDROID_MAX_API") ?: "36"
buildToolsVersion = System.getenv("ANDROID_BUILD_TOOLS_VERSION") ?: "36.1.0"
minSdkVersion = 21
minSdkVersion = 24
compileSdkVersion = compileSdkEnv.toInteger()
targetSdkVersion = targetSdkEnv.toInteger()
kotlinVersion = "1.7.20"
kotlinVersion = "2.1.20"
def ndkVersionEnv = System.getenv("ANDROID_NDK_VERSION")
if (ndkVersionEnv) {
ndkVersion = ndkVersionEnv
} else {
ndkVersion = "23.1.7779620"
}
}
repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/E2E-latest/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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.
Expand Down
4 changes: 3 additions & 1 deletion examples/E2E-latest/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
plugins { id("com.facebook.react.settings") }
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
rootProject.name = 'AnalyticsReactNativeE2E'
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
includeBuild('../node_modules/@react-native/gradle-plugin')
13 changes: 0 additions & 13 deletions examples/E2E-latest/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,8 @@ end
target 'AnalyticsReactNativeE2E' do
config = use_native_modules!

# Flags change depending on the env values.
flags = get_default_flags()

use_react_native!(
:path => config[:reactNativePath],
# Hermes is now enabled by default. Disable by setting this flag to false.
:hermes_enabled => flags[:hermes_enabled],
:fabric_enabled => flags[:fabric_enabled],
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand All @@ -35,18 +29,11 @@ target 'AnalyticsReactNativeE2E' do
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
end
end
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
react_native_post_install(
installer,
config[:reactNativePath],
:mac_catalyst_enabled => false
)
# BREAKING CHANGE: __apply_Xcode_12_5_M1_post_install_workaround removed in RN 0.84
# __apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
2 changes: 1 addition & 1 deletion examples/E2E-latest/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,6 +2288,6 @@ SPEC CHECKSUMS:
sovran-react-native: eec37f82e4429f0e3661f46aaf4fcd85d1b54f60
Yoga: c0b3f2c7e8d3e327e450223a2414ca3fa296b9a2

PODFILE CHECKSUM: 2173bf0c7110a6c59bf8d8b688f692516bd0df8b
PODFILE CHECKSUM: 10323a8f5dbb924a74acb0481e496beb99b40f1a

COCOAPODS: 1.16.2
3 changes: 3 additions & 0 deletions examples/E2E-latest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@babel/runtime": "^7.23.2",
"@react-native-community/cli": "^20.0.0",
"@react-native-community/cli-platform-android": "^20.0.0",
"@react-native-community/cli-platform-ios": "^20.0.0",
"@react-native/eslint-config": "^0.77.0",
"@react-native/metro-config": "^0.77.0",
"@segment/analytics-react-native-e2e-tests": "file:../shared-e2e",
Expand Down
Loading