Skip to content

Commit f8cc16b

Browse files
author
stevegalili
committed
upgrading 1
1 parent e35ec11 commit f8cc16b

11 files changed

Lines changed: 3579 additions & 4380 deletions

File tree

android/app/build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
120120
*/
121121
def enableHermes = project.ext.react.get("enableHermes", false);
122122

123+
/**
124+
* Architectures to build native code for in debug.
125+
*/
126+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
127+
123128
android {
124129
compileSdkVersion rootProject.ext.compileSdkVersion
125130

@@ -154,6 +159,11 @@ android {
154159
buildTypes {
155160
debug {
156161
signingConfig signingConfigs.debug
162+
if (nativeArchitectures) {
163+
ndk {
164+
abiFilters nativeArchitectures.split(',')
165+
}
166+
}
157167
}
158168
release {
159169
// Caution! In production, you need to generate your own keystore file.
@@ -195,11 +205,12 @@ dependencies {
195205
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
196206

197207
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
198-
exclude group:'com.facebook.fbjni'
208+
exclude group:'com.facebook.fbjni'
199209
}
200210

201211
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
202212
exclude group:'com.facebook.flipper'
213+
exclude group:'com.squareup.okhttp3', module:'okhttp'
203214
}
204215

205216
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {

android/app/src/main/res/values/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
55
<!-- Customize your theme here. -->
6-
<item name="android:textColor">#000000</item>
76
</style>
87

98
</resources>

android/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "28.0.3"
6-
minSdkVersion = 16
7-
compileSdkVersion = 28
8-
targetSdkVersion = 28
5+
buildToolsVersion = "30.0.2"
6+
minSdkVersion = 21
7+
compileSdkVersion = 30
8+
targetSdkVersion = 30
9+
ndkVersion = "21.4.7075529"
910
}
1011
repositories {
1112
google()
12-
jcenter()
13+
mavenCentral()
1314
}
1415
dependencies {
15-
classpath('com.android.tools.build:gradle:4.0.0')
16+
classpath("com.android.tools.build:gradle:4.2.2")
1617

1718
// NOTE: Do not place your application dependencies here; they belong
1819
// in the individual module build.gradle files
@@ -21,6 +22,7 @@ buildscript {
2122

2223
allprojects {
2324
repositories {
25+
mavenCentral()
2426
mavenLocal()
2527
maven {
2628
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

android/gradle.properties

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.33.1
28+
FLIPPER_VERSION=0.99.0
29+
30+
# https://stackoverflow.com/questions/65157720/a-failure-occurred-while-executing-com-android-build-gradle-tasks-packageandroid
31+
org.gradle.parallel=false
32+
org.gradle.caching=false
33+
org.gradle.configureondemand=false

ios/Podfile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
22
require_relative '../node_modules/react-native/scripts/react_native_pods'
33

4-
platform :ios, '10.0'
4+
platform :ios, '11.0'
55

66
target 'testingrnapps' do
77
config = use_native_modules!
8-
use_react_native!(:path => config["reactNativePath"])
9-
8+
use_react_native!(
9+
:path => config[:reactNativePath],
10+
# to enable hermes on iOS, change `false` to `true` and then install pods
11+
:hermes_enabled => false
12+
)
1013
target 'testingrnappsTests' do
1114
inherit! :complete
1215
# Pods for testing
@@ -16,17 +19,9 @@ target 'testingrnapps' do
1619
#
1720
# Note that if you have use_frameworks! enabled, Flipper will not work and
1821
# you should disable these next few lines.
19-
use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
22+
use_flipper!()
2023
post_install do |installer|
21-
flipper_post_install(installer)
24+
react_native_post_install(installer)
25+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
2226
end
2327
end
24-
25-
target 'testingrnapps-tvOS' do
26-
# Pods for testingrnapps-tvOS
27-
28-
target 'testingrnapps-tvOSTests' do
29-
inherit! :search_paths
30-
# Pods for testing
31-
end
32-
end

0 commit comments

Comments
 (0)