Skip to content

Commit 511d64d

Browse files
committed
Merge branch 'release/2.0.0'
2 parents 9e5d010 + 72b926e commit 511d64d

113 files changed

Lines changed: 10443 additions & 3148 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,19 @@ lib/android/.gradle/
33
lib/android/.idea/
44
lib/android/build/
55
lib/android/.idea/workspace.xml
6+
lib/android/bin/.project
7+
lib/android/bin/
8+
lib/node_modules
9+
lib/node_modules/
10+
lib/node_modules/*
11+
lib/coverage/
12+
Example_oldArch
13+
ExampleApp/yarn.lock
14+
ExampleApp/ios/Podfile.lock
15+
lib/react-native-we-personalization-*
16+
react-native-webview/
17+
example-component/
18+
ExampleNewArch/
19+
ExampleNewArch/*
20+
ExampleApp/src_backup/*
21+
lib/package-lock.json

ExampleApp/App.tsx

Lines changed: 0 additions & 118 deletions
This file was deleted.

ExampleApp/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ android {
8484
targetSdkVersion rootProject.ext.targetSdkVersion
8585
versionCode 1
8686
versionName "1.0"
87+
buildConfigField "boolean", "IS_BRIDGELESS_ENABLED", (findProperty("bridgelessEnabled") ?: "false")
8788
}
8889
signingConfigs {
8990
debug {

ExampleApp/android/app/src/main/java/com/sampleapp/MainApplication.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,11 @@ class MainApplication : Application(), ReactApplication {
3939
override fun onCreate() {
4040
super.onCreate()
4141
SoLoader.init(this, OpenSourceMergedSoMapping)
42-
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
43-
// If you opted-in for the New Architecture, we load the native entry point for this app.
44-
load(bridgelessEnabled=false)
45-
}
42+
load()
4643
WebengageBridge.getInstance(); // Add This
4744
// ... Webengage Initialization
4845
val webEngageConfig = WebEngageConfig.Builder()
49-
.setWebEngageKey("UPDATE_YOUR_LICENSE_CODE")
46+
.setWebEngageKey("~1341056cd")
5047
.setDebugMode(true) // only in development mode
5148
.build()
5249
registerActivityLifecycleCallbacks(

ExampleApp/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
5+
compileSdkVersion = 36
66
targetSdkVersion = 34
7-
ndkVersion = "26.1.10909125"
7+
ndkVersion = "27.1.12297006"
88
kotlinVersion = "1.9.24"
99
}
1010
repositories {

ExampleApp/android/gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,8 @@ newArchEnabled=true
3737
# Use this property to enable or disable the Hermes JS engine.
3838
# If set to false, you will be using JSC instead.
3939
hermesEnabled=true
40+
41+
# Use this property to enable edge-to-edge display support.
42+
# This allows your app to draw behind system bars for an immersive UI.
43+
# Note: Only works with ReactActivity and should not be used with custom Activity.
44+
edgeToEdgeEnabled=false

ExampleApp/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

ExampleApp/ios/ContentExtension/Info.plist

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<key>UNNotificationExtensionCategory</key>
1010
<string>myNotificationCategory</string>
1111
<key>UNNotificationExtensionInitialContentSizeRatio</key>
12-
<real>1</real>
12+
<real>1.0</real>
1313
</dict>
1414
<key>NSExtensionMainStoryboard</key>
1515
<string>MainInterface</string>
1616
<key>NSExtensionPointIdentifier</key>
1717
<string>com.apple.usernotifications.content-extension</string>
1818
</dict>
19+
<key>RCTNewArchEnabled</key>
20+
<true/>
1921
</dict>
2022
</plist>

ExampleApp/ios/Podfile

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ require Pod::Executable.execute_command('node', ['-p',
66
)', __dir__]).strip
77

88
platform :ios, min_ios_version_supported
9+
10+
# Enable New Architecture
11+
ENV['RCT_NEW_ARCH_ENABLED'] = '1'
12+
# Enable bridgeless mode
13+
ENV['RCT_BRIDGELESS_ENABLED'] = '1'
14+
915
prepare_react_native_project!
1016

1117
linkage = ENV['USE_FRAMEWORKS']
@@ -20,21 +26,24 @@ target 'SampleApp' do
2026
use_react_native!(
2127
:path => config[:reactNativePath],
2228
# An absolute path to your application root.
23-
:app_path => "#{Pod::Config.instance.installation_root}/.."
29+
:app_path => "#{Pod::Config.instance.installation_root}/..",
30+
:hermes_enabled => true, # Hermes is recommended
31+
:fabric_enabled => true, # Enable Fabric renderer
32+
:new_arch_enabled => true # Enable TurboModules + Fabric
2433
)
2534

26-
target 'SampleAppTests' do
27-
inherit! :complete
28-
# Pods for testing
29-
end
30-
3135
post_install do |installer|
32-
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
3336
react_native_post_install(
3437
installer,
3538
config[:reactNativePath],
3639
:mac_catalyst_enabled => false,
3740
# :ccache_enabled => true
3841
)
42+
43+
installer.pods_project.targets.each do |target|
44+
target.build_configurations.each do |config|
45+
config.build_settings['CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER'] = 'NO'
46+
end
47+
end
3948
end
40-
end
49+
end

0 commit comments

Comments
 (0)