Skip to content

Commit

Permalink
chore: add support for 0.76-rc.6 (#2407)
Browse files Browse the repository at this point in the history
## Description

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`:

```
#  rm -rf node_modules/ android/build android/app/build # might not be necessary 
yarn
npx patch-package

```
  • Loading branch information
maciekstosio authored Oct 21, 2024
1 parent 791cb10 commit b331ad8
Show file tree
Hide file tree
Showing 32 changed files with 4,352 additions and 3,380 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ios-build-test-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
id: install_pods
continue-on-error: true
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
run: RCT_NEW_ARCH_ENABLED=1 pod install
run: pod install

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

- name: Build app
working-directory: ${{ env.WORKING_DIRECTORY }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {
Expand All @@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {

override fun onCreate() {
super.onCreate()
SoLoader.init(this, false)
SoLoader.init(this, OpenSourceMergedSoMapping)
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
Expand Down
6 changes: 3 additions & 3 deletions Example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 23
compileSdkVersion = 34
buildToolsVersion = "35.0.0"
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 34
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.24"
Expand Down
Binary file modified Example/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion Example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5 changes: 4 additions & 1 deletion Example/android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions Example/android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
Expand Down
3 changes: 3 additions & 0 deletions Example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ require Pod::Executable.execute_command('node', ['-p',
platform :ios, min_ios_version_supported
prepare_react_native_project!

# From 0.76 new arch is enabled by default, in Example app we want to have old arch
ENV['RCT_NEW_ARCH_ENABLED'] = '0'

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
Expand Down
Loading

0 comments on commit b331ad8

Please sign in to comment.