Skip to content

Commit df28a42

Browse files
committed
Chore RN and other dependencies
1 parent 73492c1 commit df28a42

File tree

10 files changed

+1770
-1630
lines changed

10 files changed

+1770
-1630
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
source 'https://rubygems.org'
2+
23
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
34
ruby '2.7.5'
4-
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
5+
6+
gem 'cocoapods', '~> 1.11', '>= 1.11.2'

android/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: "com.android.application"
22

33
import com.android.build.OutputFile
4-
import org.apache.tools.ant.taskdefs.condition.Os
4+
//import org.apache.tools.ant.taskdefs.condition.Os
55

66
/**
77
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -194,6 +194,7 @@ android {
194194
// preBuild.dependsOn("generateCodegenArtifactsFromSchema")
195195
preDebugBuild.dependsOn(packageReactNdkDebugLibs)
196196
preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
197+
197198
// Due to a bug inside AGP, we have to explicitly set a dependency
198199
// between configureNdkBuild* tasks and the preBuild tasks.
199200
// This can be removed once this is solved: https://issuetracker.google.com/issues/207403732

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
minSdkVersion = 21
99
compileSdkVersion = 31
1010
targetSdkVersion = 31
11-
kotlinVersion = "1.5.20"
11+
//kotlinVersion = "1.5.20"
1212

1313
if (System.properties['os.arch'] == "aarch64") {
1414
// For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -33,8 +33,8 @@ buildscript {
3333

3434
allprojects {
3535
repositories {
36-
mavenCentral()
37-
mavenLocal()
36+
//mavenCentral()
37+
//mavenLocal()
3838
maven {
3939
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
4040
url("$rootDir/../node_modules/react-native/android")

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android.enableJetifier=true
2727
# Version of flipper SDK to use with React Native
2828
FLIPPER_VERSION=0.125.0
2929

30-
# Use this property to specify which architect ure you want to build.
30+
# Use this property to specify which architecture you want to build.
3131
# You can also override it from the CLI using
3232
# ./gradlew <task> -PreactNativeArchitectures=x86_64
3333
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

android/gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@rem you may not use this file except in compliance with the License.
66
@rem You may obtain a copy of the License at
77
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
99
@rem
1010
@rem Unless required by applicable law or agreed to in writing, software
1111
@rem distributed under the License is distributed on an "AS IS" BASIS,

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ project(':react-native-splash-screen').projectDir = new File(rootProject.project
55

66
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
77
include ':app'
8-
98
includeBuild('../node_modules/react-native-gradle-plugin')
9+
1010
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
1111
include(":ReactAndroid")
1212
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')

ios/Podfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
44
platform :ios, '12.4'
55
install! 'cocoapods', :deterministic_uuids => false
66

7+
production = ENV["PRODUCTION"] == "1"
8+
79
target 'ReactNativeStarterApp' do
810
config = use_native_modules!
911

@@ -13,8 +15,10 @@ target 'ReactNativeStarterApp' do
1315
use_react_native!(
1416
:path => config[:reactNativePath],
1517
# to enable hermes on iOS, change `false` to `true` and then install pods
18+
:production => production,
1619
:hermes_enabled => flags[:hermes_enabled],
1720
:fabric_enabled => flags[:fabric_enabled],
21+
:flipper_configuration => FlipperConfiguration.enabled,
1822
# An absolute path to your application root.
1923
:app_path => "#{Pod::Config.instance.installation_root}/.."
2024
)
@@ -27,12 +31,6 @@ target 'ReactNativeStarterApp' do
2731
# Pods for testing
2832
end
2933

30-
# Enables Flipper.
31-
#
32-
# Note that if you have use_frameworks! enabled, Flipper will not work and
33-
# you should disable the next line.
34-
use_flipper!()
35-
3634
post_install do |installer|
3735
react_native_post_install(installer)
3836
__apply_Xcode_12_5_M1_post_install_workaround(installer)

0 commit comments

Comments
 (0)