Skip to content

Commit 55ac386

Browse files
authored
Merge pull request #860 from Iterable/upgrade/0.79-latest
[SDK-448] Upgrade RN to the latest 0.79
2 parents e69c305 + 438e84b commit 55ac386

19 files changed

Lines changed: 662 additions & 713 deletions

File tree

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.19.0
1+
v20.19.4

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ View the [API documentation](https://iterable-react-native-sdk.netlify.app).
6969

7070
## Architecture Support
7171

72-
Iterable's React Native SDK now fully supports [React Native's New Architecture](https://reactnative.dev/architecture/landing-page), including TurboModules and Fabric. You can use the SDK with either the legacy architecture or the New Architecture.
72+
Iterable's React Native SDK supports [React Native's New
73+
Architecture](https://reactnative.dev/architecture/landing-page), including
74+
TurboModules and Fabric.
75+
76+
**IMPORTANT**: Iterable's React Native SDK supports React Native's Legacy Architecture, but it
77+
is no longer actively maintained. Use at your own risk.
7378

7479
Notes:
7580

android/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
RNIterable_kotlinVersion=2.0.21
1+
RNIterable_kotlinVersion=2.1.20
22
RNIterable_minSdkVersion=24
3-
RNIterable_targetSdkVersion=35
4-
RNIterable_compileSdkVersion=35
3+
RNIterable_targetSdkVersion=36
4+
RNIterable_compileSdkVersion=36
55
RNIterable_ndkversion=27.1.12297006
66
android.useAndroidX=true
77
android.enableJetifier=true

example/android/app/src/debug/AndroidManifest.xml

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

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
android:roundIcon="@mipmap/ic_launcher_round"
1818
android:allowBackup="false"
1919
android:theme="@style/AppTheme"
20+
android:usesCleartextTraffic="${usesCleartextTraffic}"
2021
android:supportsRtl="true">
2122
<activity
2223
android:name=".MainActivity"

example/android/app/src/main/java/iterable/reactnativesdk/example/MainApplication.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import android.app.Application
44
import com.facebook.react.PackageList
55
import com.facebook.react.ReactApplication
66
import com.facebook.react.ReactHost
7+
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
78
import com.facebook.react.ReactNativeHost
89
import com.facebook.react.ReactPackage
9-
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12-
import com.facebook.react.soloader.OpenSourceMergedSoMapping
13-
import com.facebook.soloader.SoLoader
1412

1513
class MainApplication : Application(), ReactApplication {
1614

@@ -36,10 +34,6 @@ class MainApplication : Application(), ReactApplication {
3634

3735
override fun onCreate() {
3836
super.onCreate()
39-
SoLoader.init(this, OpenSourceMergedSoMapping)
40-
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
41-
// If you opted-in for the New Architecture, we load the native entry point for this app.
42-
load()
43-
}
37+
loadReactNative(this)
4438
}
4539
}

example/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.0.21"
8+
kotlinVersion = "2.1.20"
99
}
1010
repositories {
1111
google()

example/android/gradle.properties

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
13-
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
13+
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
1414

1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
@@ -38,6 +38,11 @@ newArchEnabled=true
3838
# If set to false, you will be using JSC instead.
3939
hermesEnabled=true
4040

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
45+
4146
# Needed for react-native-webview
4247
# See: https://github.com/react-native-webview/react-native-webview/blob/HEAD/docs/Getting-Started.md
43-
android.enableJetifier=true
48+
android.enableJetifier=true
252 Bytes
Binary file not shown.

example/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.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)