Skip to content
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

chore: add support for 0.76-rc.6 #2407

Merged
merged 16 commits into from
Oct 21, 2024
Merged

chore: add support for 0.76-rc.6 #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a0f78e1
chore: bump example apps to 0.76-rc4
maciekstosio Oct 15, 2024
d93b2b1
chore: update pods for FabricExample
maciekstosio Oct 15, 2024
85322a2
chore: install pods for Example
maciekstosio Oct 15, 2024
7b58e8f
chore: revert package.json change
maciekstosio Oct 15, 2024
8396216
chore: update yarn.lock
maciekstosio Oct 15, 2024
57ca526
chore: bump to rc5
maciekstosio Oct 16, 2024
c684550
chore: Update hermes engine to rc.5
maciekstosio Oct 16, 2024
868b3f2
chore: flip the RCT_NEW_ARCH_ENABLED flag
maciekstosio Oct 17, 2024
41aeb99
chore: revert TVOS change and remove redundant flag set
maciekstosio Oct 17, 2024
6684060
chore: use libreactnative.so depending on RN version
maciekstosio Oct 18, 2024
fa8e8fe
fix: CMakeLists.txt to allow using 0.76 on paper
maciekstosio Oct 18, 2024
5675df4
chore: bump to reanimated 3.16
maciekstosio Oct 18, 2024
5d6718b
chore: explicitly set new arch in fabric app and add comments
maciekstosio Oct 18, 2024
7765e6e
chore: bump to rc6
maciekstosio Oct 18, 2024
446c8ea
Merge branch 'main' into @maciekstosio/Bump-example-apps-to-0.76.0-rc4
maciekstosio Oct 18, 2024
b7ff452
chore: add patches for RNGH
maciekstosio Oct 18, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ios-build-test-fabric.yml
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO we should keep this explicit, especially that we've had this already in place.

The same for RCT_NEW_ARCH_ENABLED=0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I checked Podfile value overrides command anyway


- 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
3 changes: 2 additions & 1 deletion Example/android/app/src/main/java/com/swmansion/rnscreens/example/MainApplication.kt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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'
kkafar marked this conversation as resolved.
Show resolved Hide resolved

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