Skip to content

Commit e12a093

Browse files
authored
feat: Upgrade react-native to v0.65.1 (#150)
1 parent ac94e6b commit e12a093

File tree

26 files changed

+1073
-464
lines changed

26 files changed

+1073
-464
lines changed

HelloWorld/android/app/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ android {
125125

126126
compileSdkVersion rootProject.ext.compileSdkVersion
127127

128-
compileOptions {
129-
sourceCompatibility JavaVersion.VERSION_1_8
130-
targetCompatibility JavaVersion.VERSION_1_8
131-
}
132-
133128
defaultConfig {
134129
applicationId "com.helloworld"
135130
minSdkVersion rootProject.ext.minSdkVersion
@@ -215,7 +210,7 @@ dependencies {
215210
// Run this once to be able to run the application with BUCK
216211
// puts all compile dependencies into folder libs for BUCK to use
217212
task copyDownloadableDepsToLibs(type: Copy) {
218-
from configurations.compile
213+
from configurations.implementation
219214
into 'libs'
220215
}
221216

HelloWorld/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "29.0.3"
5+
buildToolsVersion = "30.0.2"
66
minSdkVersion = 21
7-
compileSdkVersion = 29
8-
targetSdkVersion = 29
7+
compileSdkVersion = 30
8+
targetSdkVersion = 30
99
ndkVersion = "20.1.5948944"
1010
}
1111
repositories {
1212
google()
13-
jcenter()
13+
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:4.1.0")
16+
classpath("com.android.tools.build:gradle:4.2.1")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}
2020
}
2121

2222
allprojects {
2323
repositories {
24+
mavenCentral()
2425
mavenLocal()
2526
maven {
2627
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -32,7 +33,6 @@ allprojects {
3233
}
3334

3435
google()
35-
jcenter()
3636
maven { url 'https://www.jitpack.io' }
3737
}
3838
}

HelloWorld/android/gradle.properties

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

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.75.1
28+
FLIPPER_VERSION=0.93.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@
561561
COPY_PHASE_STRIP = NO;
562562
ENABLE_STRICT_OBJC_MSGSEND = YES;
563563
ENABLE_TESTABILITY = YES;
564-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
564+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
565565
GCC_C_LANGUAGE_STANDARD = gnu99;
566566
GCC_DYNAMIC_NO_PIC = NO;
567567
GCC_NO_COMMON_BLOCKS = YES;
@@ -626,7 +626,7 @@
626626
COPY_PHASE_STRIP = YES;
627627
ENABLE_NS_ASSERTIONS = NO;
628628
ENABLE_STRICT_OBJC_MSGSEND = YES;
629-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
629+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
630630
GCC_C_LANGUAGE_STANDARD = gnu99;
631631
GCC_NO_COMMON_BLOCKS = YES;
632632
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

HelloWorld/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

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

66
target 'HelloWorld' do
77
config = use_native_modules!

0 commit comments

Comments
 (0)