Skip to content

Commit 951d694

Browse files
authored
Upgrade to rn65 (#1604)
* Upgrade to rn65 * return jcenter * Update button snapshot tests * Upgrade jest version and fix small test * Revert "Upgrade jest version and fix small test" This reverts commit fc1fd3d. * Trigger build * Trigger build again
1 parent 368932b commit 951d694

File tree

8 files changed

+120
-22
lines changed

8 files changed

+120
-22
lines changed

.flowconfig

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ node_modules/react-native/Libraries/polyfills/.*
1111
; Flow doesn't support platforms
1212
.*/Libraries/Utilities/LoadingView.js
1313

14-
exact_by_default=true
15-
1614
[untyped]
1715
.*/node_modules/@react-native-community/cli/.*/.*
1816

@@ -25,8 +23,7 @@ node_modules/react-native/flow/
2523
[options]
2624
emoji=true
2725

28-
esproposal.optional_chaining=enable
29-
esproposal.nullish_coalescing=enable
26+
exact_by_default=true
3027

3128
module.file_ext=.js
3229
module.file_ext=.json
@@ -52,7 +49,6 @@ deprecated-type=warn
5249
unsafe-getters-setters=warn
5350
unnecessary-invariant=warn
5451
signature-verification-failure=warn
55-
deprecated-utility=error
5652

5753
[strict]
5854
deprecated-type
@@ -64,4 +60,4 @@ untyped-import
6460
untyped-type-import
6561

6662
[version]
67-
^0.137.0
63+
^0.149.0

android/app/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ android {
1717
compileSdkVersion rootProject.ext.compileSdkVersion
1818
ndkVersion rootProject.ext.ndkVersion
1919

20-
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_1_8
22-
targetCompatibility JavaVersion.VERSION_1_8
23-
}
24-
2520
defaultConfig {
2621
applicationId "com.rnuilib"
2722
minSdkVersion rootProject.ext.minSdkVersion
@@ -111,7 +106,7 @@ dependencies {
111106
// Run this once to be able to run the application with BUCK
112107
// puts all compile dependencies into folder libs for BUCK to use
113108
task copyDownloadableDepsToLibs(type: Copy) {
114-
from configurations.compile
109+
from configurations.implementation
115110
into 'libs'
116111
}
117112

android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
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
RNNKotlinVersion = "1.3.61" // Or any version above 1.3.x
1111
}
1212
repositories {
1313
mavenLocal()
1414
mavenCentral()
1515
google()
16-
jcenter()
1716
}
1817
dependencies {
1918
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"
20-
classpath("com.android.tools.build:gradle:4.1.0")
19+
classpath("com.android.tools.build:gradle:4.2.1")
2120

2221
// NOTE: Do not place your application dependencies here; they belong
2322
// in the individual module build.gradle files
@@ -26,6 +25,7 @@ buildscript {
2625

2726
allprojects {
2827
repositories {
28+
mavenCentral()
2929
mavenLocal()
3030
maven {
3131
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ android.useAndroidX=true
2121
android.enableJetifier=true
2222

2323
# Version of flipper SDK to use with React Native
24-
FLIPPER_VERSION=0.75.1
24+
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

ios/rnuilib.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,12 @@
389389
);
390390
inputPaths = (
391391
"${PODS_ROOT}/Target Support Files/Pods-rnuilib-rnuilibTests/Pods-rnuilib-rnuilibTests-frameworks.sh",
392+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
392393
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
393394
);
394395
name = "[CP] Embed Pods Frameworks";
395396
outputPaths = (
397+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
396398
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
397399
);
398400
runOnlyForDeploymentPostprocessing = 0;
@@ -439,10 +441,12 @@
439441
);
440442
inputPaths = (
441443
"${PODS_ROOT}/Target Support Files/Pods-rnuilib/Pods-rnuilib-frameworks.sh",
444+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
442445
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
443446
);
444447
name = "[CP] Embed Pods Frameworks";
445448
outputPaths = (
449+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
446450
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
447451
);
448452
runOnlyForDeploymentPostprocessing = 0;

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,14 @@
9393
"gatsby": "^2.21.21",
9494
"gh-pages": "^1.1.0",
9595
"jest": "^26.6.3",
96-
"metro-react-native-babel-preset": "^0.64.0",
96+
"metro-react-native-babel-preset": "^0.66.0",
9797
"mocha": "^5.0.0",
9898
"prettier-eslint": "12.0.0",
99-
"react": "17.0.1",
99+
"react": "17.0.2",
100100
"react-autobind": "^1.0.6",
101101
"react-dom": "^15.4.2",
102-
"react-native": "0.64.1",
102+
"react-native": "0.65.1",
103+
"react-native-codegen": "^0.0.7",
103104
"react-native-gesture-handler": "1.10.3",
104105
"react-native-haptic-feedback": "^1.11.0",
105106
"react-native-keyboard-tracking-view": "^5.6.1",

0 commit comments

Comments
 (0)