Skip to content

Commit d7a79a5

Browse files
committed
first try
1 parent be24e53 commit d7a79a5

File tree

22 files changed

+3398
-3585
lines changed

22 files changed

+3398
-3585
lines changed

.gitignore

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -56,7 +56,7 @@ yarn-error.log
5656
*.jsbundle
5757

5858
# Ruby / CocoaPods
59-
/ios/Pods/
59+
**/Pods/
6060
/vendor/bundle/
6161

6262
# Temporary files created by Metro to check the health of the file watcher
@@ -72,4 +72,12 @@ web-build/
7272

7373
# caches
7474
.eslintcache
75-
.tmp
75+
.tmp
76+
77+
# Yarn
78+
.yarn/*
79+
!.yarn/patches
80+
!.yarn/plugins
81+
!.yarn/releases
82+
!.yarn/sdks
83+
!.yarn/versions

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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'
9+
gem 'xcodeproj', '< 1.26.0'

Gemfile.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ PLATFORMS
8989
ruby
9090

9191
DEPENDENCIES
92-
activesupport (>= 6.1.7.5, < 7.1.0)
93-
cocoapods (>= 1.13, < 1.15)
92+
activesupport (>= 6.1.7.5, != 7.1.0)
93+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
94+
xcodeproj (< 1.26.0)
9495

9596
RUBY VERSION
9697
ruby 2.7.6p219

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
/**
@@ -111,7 +114,6 @@ android {
111114
dependencies {
112115
// The version of react-native is set by the React Native Gradle Plugin
113116
implementation("com.facebook.react:react-android")
114-
implementation("com.facebook.react:flipper-integration")
115117

116118
if (hermesEnabled.toBoolean()) {
117119
implementation("com.facebook.react:hermes-android")
@@ -121,4 +123,3 @@ dependencies {
121123
}
122124

123125
apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
124-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
android:icon="@mipmap/ic_launcher"
77
android:roundIcon="@mipmap/ic_launcher_round"
88
android:allowBackup="false"
9-
android:theme="@style/AppTheme">
9+
android:theme="@style/AppTheme"
10+
android:supportsRtl="true">
1011
<activity android:name=".MainActivity"
1112
android:label="@string/app_name"
1213
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +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.flipper.ReactNativeFlipper
12+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1313
import com.facebook.soloader.SoLoader
1414

1515
class MainApplication : Application(), ReactApplication {
@@ -31,15 +31,14 @@ class MainApplication : Application(), ReactApplication {
3131
}
3232

3333
override val reactHost: ReactHost
34-
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
34+
get() = getDefaultReactHost(applicationContext, reactNativeHost)
3535

3636
override fun onCreate() {
3737
super.onCreate()
38-
SoLoader.init(this, false)
38+
SoLoader.init(this, OpenSourceMergedSoMapping)
3939
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
4040
// If you opted-in for the New Architecture, we load the native entry point for this app.
4141
load()
4242
}
43-
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
4443
}
4544
}

android/app/src/main/res/drawable/rn_edit_text_material.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
1818
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
1919
android:insetTop="@dimen/abc_edit_text_inset_top_material"
20-
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
20+
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
21+
>
2122

2223
<selector>
2324
<!--

android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 21
5-
compileSdkVersion = 34
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 24
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
7-
ndkVersion = "25.1.8937393"
8-
kotlinVersion = "1.8.0"
7+
ndkVersion = "26.1.10909125"
8+
kotlinVersion = "1.9.24"
99
}
1010
repositories {
1111
google()

android/gradle.properties

Lines changed: 1 addition & 3 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
@@ -34,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3432
# your application. You should enable this flag either if you want
3533
# to write custom TurboModules/Fabric components OR use libraries that
3634
# are providing them.
37-
newArchEnabled=false
35+
newArchEnabled=true
3836

3937
# Use this property to enable or disable the Hermes JS engine.
4038
# If set to false, you will be using JSC instead.
-19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)