Skip to content

Commit 9fda3bf

Browse files
JeremyDolleJeremyDolle
committed
chore(update): update react native
1 parent 274029d commit 9fda3bf

File tree

11 files changed

+54
-32
lines changed

11 files changed

+54
-32
lines changed

‎template/Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ 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-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

‎template/android/app/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '..'
12-
// root = file("../")
13-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
14-
// reactNativeDir = file("../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
16-
// codegenDir = file("../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
18-
// cliFile = file("../node_modules/react-native/cli.js")
11+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12+
// root = file("../../")
13+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14+
// reactNativeDir = file("../../node_modules/react-native")
15+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16+
// codegenDir = file("../../node_modules/@react-native/codegen")
17+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18+
// cliFile = file("../../node_modules/react-native/cli.js")
1919

2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to
@@ -49,6 +49,9 @@ react {
4949
//
5050
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5151
// hermesFlags = ["-O", "-output-source-map"]
52+
53+
/* Autolinking */
54+
autolinkLibrariesWithApp()
5255
}
5356

5457
/**
@@ -114,5 +117,3 @@ dependencies {
114117
implementation jscFlavor
115118
}
116119
}
117-
118-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

‎template/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:allowBackup="false"
1111
android:theme="@style/AppTheme"
12-
>
12+
android:supportsRtl="true"
13+
>
1314
<activity
1415
android:name=".MainActivity"
1516
android:label="@string/app_name"

‎template/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
compileSdkVersion = 34
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.22"
8+
kotlinVersion = "1.9.24"
99
}
1010
repositories {
1111
google()

‎template/android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
2121
# Android operating system, and which are packaged with your app's APK
2222
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2323
android.useAndroidX=true
24-
# Automatically convert third-party libraries to use AndroidX
25-
android.enableJetifier=true
2624

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

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

‎template/android/gradlew

Lines changed: 1 addition & 1 deletion
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/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/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/.

‎template/android/settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
2+
plugins { id("com.facebook.react.settings") }
3+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
14
rootProject.name = 'Boilerplate'
2-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
35
include ':app'
46
includeBuild('../node_modules/@react-native/gradle-plugin')

‎template/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@tanstack/react-query": "^5.31.0",
2121
"i18next": "^23.11.2",
2222
"ky": "^1.2.4",
23-
"react": "18.2.0",
23+
"react": "18.3.1",
2424
"react-i18next": "^14.1.0",
25-
"react-native": "0.74.1",
25+
"react-native": "0.75.3",
2626
"react-native-gesture-handler": "^2.16.0",
2727
"react-native-mmkv": "^2.12.2",
2828
"react-native-reanimated": "^3.9.0-rc.1",
@@ -34,10 +34,10 @@
3434
"@babel/core": "^7.20.0",
3535
"@babel/preset-env": "^7.20.0",
3636
"@babel/runtime": "^7.20.0",
37-
"@react-native/babel-preset": "0.74.83",
38-
"@react-native/eslint-config": "0.74.83",
39-
"@react-native/metro-config": "0.74.83",
40-
"@react-native/typescript-config": "0.74.83",
37+
"@react-native/babel-preset": "0.75.3",
38+
"@react-native/eslint-config": "0.75.3",
39+
"@react-native/metro-config": "0.75.3",
40+
"@react-native/typescript-config": "0.75.3",
4141
"@testing-library/jest-native": "^5.4.2",
4242
"@testing-library/react-native": "^12.1.2",
4343
"@types/jest": "^29.4.0",
@@ -58,7 +58,7 @@
5858
"eslint-plugin-jsx-a11y": "^6.8.0",
5959
"jest": "^29.6.3",
6060
"prettier": "2.8.8",
61-
"react-test-renderer": "18.2.0",
61+
"react-test-renderer": "18.3.1",
6262
"reactotron-react-native": "^5.1.6",
6363
"reactotron-react-native-mmkv": "^0.2.6",
6464
"reactotron-react-query": "^1.0.4",

‎template/src/theme/borders.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ export const generateBorderRadius = () => {
4242
},
4343
[`roundedBottom_${radius}`]: {
4444
borderBottomLeftRadius: radius,
45-
borderBottomRightRadiusRadius: radius,
45+
borderBottomRightRadius: radius,
46+
},
47+
[`roundedBottomRight_${radius}`]: {
48+
borderBottomRightRadius: radius,
49+
},
50+
[`roundedTopLeft_${radius}`]: {
51+
borderTopLeftRadius: radius,
4652
},
4753
});
4854
}, {} as BorderRadius & BorderTopRadius & BorderBottomRadius);

0 commit comments

Comments
 (0)