Skip to content

Commit 6123ddc

Browse files
committed
chore(rn): update to latest react native version
1 parent d5d2571 commit 6123ddc

File tree

13 files changed

+2533
-2502
lines changed

13 files changed

+2533
-2502
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build/
99
.gradle
1010
local.properties
1111
*.iml
12+
.vscode
1213

1314
# node.js
1415
#

template/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ PLATFORMS
9393
ruby
9494

9595
DEPENDENCIES
96-
activesupport (>= 6.1.7.5, < 7.1.0)
97-
cocoapods (>= 1.13, < 1.15)
96+
activesupport (>= 6.1.7.5, != 7.1.0)
97+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
9898

9999
RUBY VERSION
100100
ruby 2.6.10p210

template/android/app/src/main/java/com/boilerplate/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()

template/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"

template/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3232
# your application. You should enable this flag either if you want
3333
# to write custom TurboModules/Fabric components OR use libraries that
3434
# are providing them.
35-
newArchEnabled=false
35+
newArchEnabled=true
3636

3737
# Use this property to enable or disable the Hermes JS engine.
3838
# If set to false, you will be using JSC instead.
Binary file not shown.

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

template/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

template/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 ##########################################################################

template/ios/Boilerplate.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
"$(inherited)",
443443
);
444444
INFOPLIST_FILE = BoilerplateTests/Info.plist;
445-
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
445+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
446446
LD_RUNPATH_SEARCH_PATHS = (
447447
"$(inherited)",
448448
"@executable_path/Frameworks",
@@ -466,7 +466,7 @@
466466
BUNDLE_LOADER = "$(TEST_HOST)";
467467
COPY_PHASE_STRIP = NO;
468468
INFOPLIST_FILE = BoilerplateTests/Info.plist;
469-
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
469+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
470470
LD_RUNPATH_SEARCH_PATHS = (
471471
"$(inherited)",
472472
"@executable_path/Frameworks",
@@ -589,7 +589,7 @@
589589
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
590590
GCC_WARN_UNUSED_FUNCTION = YES;
591591
GCC_WARN_UNUSED_VARIABLE = YES;
592-
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
592+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
593593
LD = "";
594594
LDPLUSPLUS = "";
595595
LD_RUNPATH_SEARCH_PATHS = (
@@ -670,7 +670,7 @@
670670
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
671671
GCC_WARN_UNUSED_FUNCTION = YES;
672672
GCC_WARN_UNUSED_VARIABLE = YES;
673-
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
673+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
674674
LD = "";
675675
LDPLUSPLUS = "";
676676
LD_RUNPATH_SEARCH_PATHS = (

0 commit comments

Comments
 (0)