Skip to content

Commit dc8c058

Browse files
maciekstosiokkafar
authored andcommitted
chore: add support for 0.76-rc.6 (#2407)
This PR bumps example apps to 0.76.0-rc.6. Removed outdated patches for react-native-reanimated and react-native-gesture-handler. Add patch for react-native-safe-area-context. Reanimated is provided as `.tgz` it should be released with the necessary fixes any day now. Tested also on 0.75.4 both paper and fabric seems to work fine. To run it go to `Example` / `FabricExample`: ``` yarn npx patch-package ``` (cherry picked from commit b331ad8)
1 parent da70a27 commit dc8c058

32 files changed

+4343
-3450
lines changed

.github/workflows/ios-build-test-fabric.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
id: install_pods
5555
continue-on-error: true
5656
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
57-
run: RCT_NEW_ARCH_ENABLED=1 pod install
57+
run: pod install
5858

5959
- if: steps.install_pods.outcome == 'failure'
6060
id: remove_pods
@@ -66,7 +66,7 @@ jobs:
6666
id: reinstall_pods
6767
name: Reinstall pods
6868
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
69-
run: RCT_NEW_ARCH_ENABLED=1 pod install
69+
run: pod install
7070

7171
- name: Build app
7272
working-directory: ${{ env.WORKING_DIRECTORY }}

Example/android/app/src/main/java/com/swmansion/rnscreens/example/MainApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.facebook.react.ReactPackage
99
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
1213
import com.facebook.soloader.SoLoader
1314

1415
class MainApplication : Application(), ReactApplication {
@@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {
3435

3536
override fun onCreate() {
3637
super.onCreate()
37-
SoLoader.init(this, false)
38+
SoLoader.init(this, OpenSourceMergedSoMapping)
3839
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
3940
// If you opted-in for the New Architecture, we load the native entry point for this app.
4041
load()

Example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 23
5-
compileSdkVersion = 34
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 24
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
88
kotlinVersion = "1.9.24"
-19.7 KB
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
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

Example/android/gradlew

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

Example/android/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%" == "" @echo off
1820
@rem ##########################################################################

Example/ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ require Pod::Executable.execute_command('node', ['-p',
88
platform :ios, min_ios_version_supported
99
prepare_react_native_project!
1010

11+
# From 0.76 new arch is enabled by default, in Example app we want to have old arch
12+
ENV['RCT_NEW_ARCH_ENABLED'] = '0'
13+
1114
linkage = ENV['USE_FRAMEWORKS']
1215
if linkage != nil
1316
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green

0 commit comments

Comments
 (0)