Skip to content

Commit 06dff24

Browse files
committed
- update react native 0.74.1
1 parent ae82e05 commit 06dff24

File tree

18 files changed

+12658
-10103
lines changed

18 files changed

+12658
-10103
lines changed

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
source 'https://rubygems.org'
2-
31
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby File.read(File.join(__dir__, '.ruby-version')).strip
52
ruby ">= 2.6.10"
63

7-
gem 'cocoapods', '~> 1.12'
4+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
5+
# bound in the template on Cocoapods with next React Native release.
6+
gem 'cocoapods', '>= 1.13', '< 1.15'
7+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ android {
153153
dependencies {
154154
// The version of react-native is set by the React Native Gradle Plugin
155155
implementation("com.facebook.react:react-android")
156-
implementation("com.facebook.react:flipper-integration")
157156

158157
if (hermesEnabled.toBoolean()) {
159158
implementation("com.facebook.react:hermes-android")

android/app/src/main/java/com/react_native_movie/MainApplication.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ import com.facebook.react.ReactPackage
1010
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1111
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1212
import com.facebook.react.defaults.DefaultReactNativeHost
13-
import com.facebook.react.flipper.ReactNativeFlipper
1413
import com.facebook.soloader.SoLoader
1514

1615
public class MainApplication : Application(), ReactApplication {
1716

1817
override val reactNativeHost: ReactNativeHost =
1918
object : DefaultReactNativeHost(this) {
20-
override fun getPackages(): List<ReactPackage> {
19+
override fun getPackages(): List<ReactPackage> =
20+
PackageList(this).packages.apply {
2121
// Packages that cannot be autolinked yet can be added manually here, for example:
22-
// packages.add(new MyReactNativePackage());
23-
return PackageList(this).packages
24-
}
22+
// add(MyReactNativePackage())
23+
}
2524

2625
override fun getJSMainModuleName(): String = "index"
2726

@@ -32,7 +31,7 @@ public class MainApplication : Application(), ReactApplication {
3231
}
3332

3433
override val reactHost: ReactHost
35-
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
34+
get() = getDefaultReactHost(applicationContext, reactNativeHost)
3635

3736
override fun onCreate() {
3837
super.onCreate()
@@ -41,6 +40,5 @@ public class MainApplication : Application(), ReactApplication {
4140
// If you opted-in for the New Architecture, we load the native entry point for this app.
4241
load()
4342
}
44-
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
4543
}
4644
}

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "33.0.0"
6-
minSdkVersion = 21
5+
buildToolsVersion = "34.0.0"
6+
minSdkVersion = 23
77
compileSdkVersion = 34
88
targetSdkVersion = 34
9-
ndkVersion = "25.1.8937393"
10-
kotlinVersion = "1.8.0"
9+
ndkVersion = "26.1.10909125"
10+
kotlinVersion = "1.9.22"
1111
}
1212
repositories {
1313
google()

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

android/gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
4343
if %ERRORLEVEL% equ 0 goto execute
4444

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
45+
echo. 1>&2
46+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
47+
echo. 1>&2
48+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
49+
echo location of your Java installation. 1>&2
5050

5151
goto fail
5252

@@ -56,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

5757
if exist "%JAVA_EXE%" goto execute
5858

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
59+
echo. 1>&2
60+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
61+
echo. 1>&2
62+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
63+
echo location of your Java installation. 1>&2
6464

6565
goto fail
6666

babel.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
module.exports = {
22
presets: ['module:metro-react-native-babel-preset'],
3+
overrides: [{
4+
"plugins": [
5+
["@babel/plugin-transform-private-methods", {
6+
"loose": true
7+
}]
8+
]
9+
}]
310
};

ios/Podfile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Resolve react_native_pods.rb with node to allow for hoisting
1+
# Resolve react_native_pods.rb with node to allow for hoisting\
22
require Pod::Executable.execute_command('node', ['-p',
33
'require.resolve(
44
"react-native/scripts/react_native_pods.rb",
@@ -8,17 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
88
platform :ios, min_ios_version_supported
99
prepare_react_native_project!
1010

11-
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
12-
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
13-
#
14-
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
15-
# ```js
16-
# module.exports = {
17-
# dependencies: {
18-
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
19-
# ```
20-
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
21-
2211
linkage = ENV['USE_FRAMEWORKS']
2312
if linkage != nil
2413
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -36,11 +25,6 @@ target 'react_native_movie' do
3625
# Hermes is now enabled by default. Disable by setting this flag to false.
3726
:hermes_enabled => flags[:hermes_enabled],
3827
:fabric_enabled => flags[:fabric_enabled],
39-
# Enables Flipper.
40-
#
41-
# Note that if you have use_frameworks! enabled, Flipper will not work and
42-
# you should disable the next line.
43-
:flipper_configuration => flipper_config,
4428
# An absolute path to your application root.
4529
:app_path => "#{Pod::Config.instance.installation_root}/.."
4630
)
@@ -55,7 +39,8 @@ target 'react_native_movie' do
5539
installer,
5640
# Set `mac_catalyst_enabled` to `true` in order to apply patches
5741
# necessary for Mac Catalyst builds
58-
:mac_catalyst_enabled => false
42+
:mac_catalyst_enabled => false,
43+
# :ccache_enabled => true
5944
)
6045
__apply_Xcode_12_5_M1_post_install_workaround(installer)
6146
end

ios/PrivacyInfo.xcprivacy

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyAccessedAPITypes</key>
6+
<array>
7+
<dict>
8+
<key>NSPrivacyAccessedAPIType</key>
9+
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
10+
<key>NSPrivacyAccessedAPITypeReasons</key>
11+
<array>
12+
<string>C617.1</string>
13+
</array>
14+
</dict>
15+
<dict>
16+
<key>NSPrivacyAccessedAPIType</key>
17+
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
18+
<key>NSPrivacyAccessedAPITypeReasons</key>
19+
<array>
20+
<string>CA92.1</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>NSPrivacyAccessedAPIType</key>
25+
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
26+
<key>NSPrivacyAccessedAPITypeReasons</key>
27+
<array>
28+
<string>35F9.1</string>
29+
</array>
30+
</dict>
31+
</array>
32+
<key>NSPrivacyCollectedDataTypes</key>
33+
<array/>
34+
<key>NSPrivacyTracking</key>
35+
<false/>
36+
</dict>
37+
</plist>

ios/react_native_movie.xcodeproj/project.pbxproj

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1515
7699B88040F8A987B510C191 /* libPods-react_native_movie-react_native_movieTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-react_native_movie-react_native_movieTests.a */; };
1616
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
17+
D63B7C75FA055575DA583706 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = EBE735E186DAD6F6AB3C32F1 /* PrivacyInfo.xcprivacy */; };
1718
/* End PBXBuildFile section */
1819

1920
/* Begin PBXContainerItemProxy section */
@@ -43,6 +44,7 @@
4344
5DCACB8F33CDC322A6C60F78 /* libPods-react_native_movie.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-react_native_movie.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4445
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = react_native_movie/LaunchScreen.storyboard; sourceTree = "<group>"; };
4546
89C6BE57DB24E9ADA2F236DE /* Pods-react_native_movie-react_native_movieTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-react_native_movie-react_native_movieTests.release.xcconfig"; path = "Target Support Files/Pods-react_native_movie-react_native_movieTests/Pods-react_native_movie-react_native_movieTests.release.xcconfig"; sourceTree = "<group>"; };
47+
EBE735E186DAD6F6AB3C32F1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = react_native_movie/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
4648
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
4749
/* End PBXFileReference section */
4850

@@ -92,6 +94,7 @@
9294
13B07FB61A68108700A75B9A /* Info.plist */,
9395
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
9496
13B07FB71A68108700A75B9A /* main.m */,
97+
EBE735E186DAD6F6AB3C32F1 /* PrivacyInfo.xcprivacy */,
9598
);
9699
name = react_native_movie;
97100
sourceTree = "<group>";
@@ -244,6 +247,7 @@
244247
files = (
245248
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
246249
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
250+
D63B7C75FA055575DA583706 /* PrivacyInfo.xcprivacy in Resources */,
247251
);
248252
runOnlyForDeploymentPostprocessing = 0;
249253
};
@@ -531,8 +535,9 @@
531535
isa = XCBuildConfiguration;
532536
buildSettings = {
533537
ALWAYS_SEARCH_USER_PATHS = NO;
538+
CC = "";
534539
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
535-
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
540+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
536541
CLANG_CXX_LIBRARY = "libc++";
537542
CLANG_ENABLE_MODULES = YES;
538543
CLANG_ENABLE_OBJC_ARC = YES;
@@ -558,6 +563,7 @@
558563
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
559564
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
560565
COPY_PHASE_STRIP = NO;
566+
CXX = "";
561567
ENABLE_STRICT_OBJC_MSGSEND = YES;
562568
ENABLE_TESTABILITY = YES;
563569
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -577,6 +583,8 @@
577583
GCC_WARN_UNUSED_FUNCTION = YES;
578584
GCC_WARN_UNUSED_VARIABLE = YES;
579585
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
586+
LD = "";
587+
LDPLUSPLUS = "";
580588
LD_RUNPATH_SEARCH_PATHS = (
581589
/usr/lib/swift,
582590
"$(inherited)",
@@ -595,11 +603,7 @@
595603
"-DFOLLY_MOBILE=1",
596604
"-DFOLLY_USE_LIBCPP=1",
597605
);
598-
OTHER_LDFLAGS = (
599-
"$(inherited)",
600-
"-Wl",
601-
"-ld_classic",
602-
);
606+
OTHER_LDFLAGS = "$(inherited)";
603607
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
604608
SDKROOT = iphoneos;
605609
USE_HERMES = true;
@@ -610,8 +614,9 @@
610614
isa = XCBuildConfiguration;
611615
buildSettings = {
612616
ALWAYS_SEARCH_USER_PATHS = NO;
617+
CC = "";
613618
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
614-
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
619+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
615620
CLANG_CXX_LIBRARY = "libc++";
616621
CLANG_ENABLE_MODULES = YES;
617622
CLANG_ENABLE_OBJC_ARC = YES;
@@ -637,6 +642,7 @@
637642
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
638643
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
639644
COPY_PHASE_STRIP = YES;
645+
CXX = "";
640646
ENABLE_NS_ASSERTIONS = NO;
641647
ENABLE_STRICT_OBJC_MSGSEND = YES;
642648
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -649,6 +655,8 @@
649655
GCC_WARN_UNUSED_FUNCTION = YES;
650656
GCC_WARN_UNUSED_VARIABLE = YES;
651657
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
658+
LD = "";
659+
LDPLUSPLUS = "";
652660
LD_RUNPATH_SEARCH_PATHS = (
653661
/usr/lib/swift,
654662
"$(inherited)",
@@ -666,11 +674,7 @@
666674
"-DFOLLY_MOBILE=1",
667675
"-DFOLLY_USE_LIBCPP=1",
668676
);
669-
OTHER_LDFLAGS = (
670-
"$(inherited)",
671-
"-Wl",
672-
"-ld_classic",
673-
);
677+
OTHER_LDFLAGS = "$(inherited)";
674678
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
675679
SDKROOT = iphoneos;
676680
USE_HERMES = true;

0 commit comments

Comments
 (0)