Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

Commit 96b8e03

Browse files
authored
Bump RN to 0.72.3 and expo-modules-core to 1.5.7 (#9)
* builds * bum eslint * update pods
1 parent 316898b commit 96b8e03

File tree

15 files changed

+4286
-5297
lines changed

15 files changed

+4286
-5297
lines changed

example/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native-community',
3+
extends: '@react-native',
44
};

example/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby '>= 2.6.10'
55

6-
gem 'cocoapods', '>= 1.11.3'
6+
gem 'cocoapods', '~> 1.12'

example/android/app/src/main/java/com/jellyfishexample/MainActivity.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ protected ReactActivityDelegate createReactActivityDelegate() {
2828
this,
2929
getMainComponentName(),
3030
// If you opted-in for the New Architecture, we enable the Fabric Renderer.
31-
DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
32-
// If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
33-
DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
34-
));
31+
DefaultNewArchitectureEntryPoint.getFabricEnabled()));
3532
}
3633
}

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
mavenCentral()
1616
}
1717
dependencies {
18-
classpath("com.android.tools.build:gradle:7.4.1")
18+
classpath("com.android.tools.build:gradle")
1919
classpath("com.facebook.react:react-native-gradle-plugin")
2020
}
2121
}

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.125.0
28+
FLIPPER_VERSION=0.182.0
2929

3030
# Use this property to specify which architecture you want to build.
3131
# You can also override it from the CLI using

example/android/gradlew

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,8 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
8683
APP_BASE_NAME=${0##*/}
84+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8785

8886
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8987
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rootProject.name = 'JellyfishExample'
22
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
33
include ':app'
4-
includeBuild('../node_modules/react-native-gradle-plugin')
4+
includeBuild('../node_modules/@react-native/gradle-plugin')
55

66
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
77
useExpoModules()

example/ios/JellyfishExample.xcodeproj/project.pbxproj

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "JellyfishExampleTests" */;
187187
buildPhases = (
188188
A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */,
189+
EC302C2D573892907E91A28D /* [Expo] Configure project */,
189190
00E356EA1AD99517003FC87E /* Sources */,
190191
00E356EB1AD99517003FC87E /* Frameworks */,
191192
00E356EC1AD99517003FC87E /* Resources */,
@@ -208,6 +209,7 @@
208209
buildPhases = (
209210
C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */,
210211
FD10A7F022414F080027D42C /* Start Packager */,
212+
2C2C21F5B052BD7681B67CFD /* [Expo] Configure project */,
211213
13B07F871A680F5B00A75B9A /* Sources */,
212214
13B07F8C1A680F5B00A75B9A /* Frameworks */,
213215
13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -313,6 +315,25 @@
313315
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JellyfishExample/Pods-JellyfishExample-frameworks.sh\"\n";
314316
showEnvVarsInLog = 0;
315317
};
318+
2C2C21F5B052BD7681B67CFD /* [Expo] Configure project */ = {
319+
isa = PBXShellScriptBuildPhase;
320+
alwaysOutOfDate = 1;
321+
buildActionMask = 2147483647;
322+
files = (
323+
);
324+
inputFileListPaths = (
325+
);
326+
inputPaths = (
327+
);
328+
name = "[Expo] Configure project";
329+
outputFileListPaths = (
330+
);
331+
outputPaths = (
332+
);
333+
runOnlyForDeploymentPostprocessing = 0;
334+
shellPath = /bin/sh;
335+
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-JellyfishExample/expo-configure-project.sh\"\n";
336+
};
316337
A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
317338
isa = PBXShellScriptBuildPhase;
318339
buildActionMask = 2147483647;
@@ -391,6 +412,25 @@
391412
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JellyfishExample/Pods-JellyfishExample-resources.sh\"\n";
392413
showEnvVarsInLog = 0;
393414
};
415+
EC302C2D573892907E91A28D /* [Expo] Configure project */ = {
416+
isa = PBXShellScriptBuildPhase;
417+
alwaysOutOfDate = 1;
418+
buildActionMask = 2147483647;
419+
files = (
420+
);
421+
inputFileListPaths = (
422+
);
423+
inputPaths = (
424+
);
425+
name = "[Expo] Configure project";
426+
outputFileListPaths = (
427+
);
428+
outputPaths = (
429+
);
430+
runOnlyForDeploymentPostprocessing = 0;
431+
shellPath = /bin/sh;
432+
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-JellyfishExample-JellyfishExampleTests/expo-configure-project.sh\"\n";
433+
};
394434
F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = {
395435
isa = PBXShellScriptBuildPhase;
396436
buildActionMask = 2147483647;
@@ -632,6 +672,7 @@
632672
);
633673
MTL_ENABLE_DEBUG_INFO = YES;
634674
ONLY_ACTIVE_ARCH = YES;
675+
OTHER_CFLAGS = "$(inherited)";
635676
OTHER_CPLUSPLUSFLAGS = (
636677
"$(OTHER_CFLAGS)",
637678
"-DFOLLY_NO_CONFIG",
@@ -696,6 +737,7 @@
696737
"\"$(inherited)\"",
697738
);
698739
MTL_ENABLE_DEBUG_INFO = NO;
740+
OTHER_CFLAGS = "$(inherited)";
699741
OTHER_CPLUSPLUSFLAGS = (
700742
"$(OTHER_CFLAGS)",
701743
"-DFOLLY_NO_CONFIG",

example/ios/JellyfishExample/AppDelegate.mm

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,4 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
2323
#endif
2424
}
2525

26-
/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
27-
///
28-
/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
29-
/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
30-
/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
31-
- (BOOL)concurrentRootEnabled
32-
{
33-
return true;
34-
}
35-
3626
@end

example/ios/Podfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
2-
require_relative '../node_modules/react-native/scripts/react_native_pods'
3-
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
2+
# Resolve react_native_pods.rb with node to allow for hoisting
3+
require Pod::Executable.execute_command('node', ['-p',
4+
'require.resolve(
5+
"react-native/scripts/react_native_pods.rb",
6+
{paths: [process.argv[1]]},
7+
)', __dir__]).strip
48

59
platform :ios, '13.0'
610
prepare_react_native_project!
@@ -67,6 +71,7 @@ target 'JellyfishExample' do
6771
installer,
6872
# Set `mac_catalyst_enabled` to `true` in order to apply patches
6973
# necessary for Mac Catalyst builds
74+
config[:reactNativePath],
7075
:mac_catalyst_enabled => false
7176
)
7277
__apply_Xcode_12_5_M1_post_install_workaround(installer)

0 commit comments

Comments
 (0)