Skip to content

Commit 3ff863f

Browse files
authored
chore: bump react-native to 0.68 (#823)
1 parent 33cd14b commit 3ff863f

File tree

11 files changed

+3058
-4882
lines changed

11 files changed

+3058
-4882
lines changed

.circleci/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ workflows:
284284
- "Test: lint"
285285
- "Test: TypeScript"
286286
- "Test: Android unit"
287+
filters:
288+
branches:
289+
only:
290+
- temporarily-disabled--see-issue-840
287291
- "Release":
288292
requires:
289293
- "Test: iOS e2e"

.github/workflows/ci.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- name: Set up Node.js
13-
uses: actions/setup-node@v2.5.1
13+
uses: actions/setup-node@v3.3.0
1414
with:
15-
node-version: 14
15+
node-version: 16
1616
- name: Checkout
17-
uses: actions/checkout@v2.4.0
17+
uses: actions/checkout@v3
1818
- name: Cache /.cache/yarn
19-
uses: actions/cache@v2.1.7
19+
uses: actions/cache@v3
2020
with:
2121
path: .cache/yarn
2222
key: ${{ hashFiles('yarn.lock') }}
@@ -42,13 +42,13 @@ jobs:
4242
- name: Setup VSTest.console.exe
4343
uses: darenm/Setup-VSTest@v1
4444
- name: Set up Node.js
45-
uses: actions/setup-node@v2.5.1
45+
uses: actions/setup-node@v3.3.0
4646
with:
47-
node-version: 14
47+
node-version: 16
4848
- name: Checkout
49-
uses: actions/checkout@v2.4.0
49+
uses: actions/checkout@v3
5050
- name: Cache /.cache/yarn
51-
uses: actions/cache@v2.1.7
51+
uses: actions/cache@v3
5252
with:
5353
path: .cache/yarn
5454
key: ${{ hashFiles('yarn.lock') }}
@@ -58,11 +58,7 @@ jobs:
5858
- name: Install Windows test app
5959
run: |
6060
yarn install-windows-test-app -p example/windows
61-
- name: Install NuGet packages
62-
run: |
63-
nuget restore
64-
working-directory: example/windows
6561
- name: Build
6662
run: |
67-
MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts AsyncStorageExample.sln
63+
yarn react-native run-windows --release --arch x64 --logging --no-packager --no-launch --no-deploy --msbuildprops "BundleEntryFile=index.ts" --no-telemetry
6864
working-directory: example/windows

android/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ buildscript {
4242
: '1.6.10'
4343

4444
repositories {
45-
google()
4645
mavenCentral()
46+
google()
4747
}
4848
dependencies {
49-
if (project == rootProject) {
50-
classpath 'com.android.tools.build:gradle:4.2.2'
49+
def projectExampleDir = Paths.get(project.projectDir.getParent(), "example", "android").toString()
50+
def rootProjectDir = rootProject.projectDir.getPath()
51+
if (projectExampleDir == rootProjectDir) {
5152
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$asyncStorageKtVersion"
5253
}
5354
}

example/android/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@ buildscript {
3838
println("[AsyncStorage] Using Next storage: " + nextStorageFlag)
3939

4040
repositories {
41-
google()
4241
mavenCentral()
43-
jcenter()
42+
google()
4443
}
4544

4645
dependencies {
4746
classpath "com.android.tools.build:gradle:$androidPluginVersion"
48-
// kotlinVersion is applied from react-native-test-app's dependencies.gradle script
49-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
5047
}
5148
}
5249

@@ -55,7 +52,8 @@ allprojects {
5552
maven {
5653
url("$rootDir/../../node_modules/detox/Detox-android")
5754
}
58-
jcenter()
55+
mavenCentral()
56+
google()
5957
}
6058
afterEvaluate { project ->
6159
def androidExtension = project.extensions.findByName('android')

example/android/gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,19 @@ android.enableJetifier=true
3131
# Native defaults to. To disable Flipper, set it to `false`.
3232
#FLIPPER_VERSION=0.125.0
3333

34+
# Enable Fabric at runtime.
35+
#USE_FABRIC=1
36+
37+
# Enable new architecture, i.e. Fabric + TurboModule - implies USE_FABRIC=1.
38+
# Note that this is incompatible with web debugging.
39+
#newArchEnabled=true
40+
3441
# Uncomment the line below if building react-native from source
3542
#ANDROID_NDK_VERSION=21.4.7075529
3643

44+
# Version of Kotlin to build against.
45+
KOTLIN_VERSION=1.6.21
46+
3747
# This is an example of how you can change default DB size (6MB) to 10MB
3848
#AsyncStorage_db_size_in_MB=10
3949

285 Bytes
Binary file not shown.
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-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

example/ios/Podfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ use_test_app! do |target|
77
target.app do
88
pod 'RNCAsyncStorage', :path => '../..'
99
pod 'AsyncStorageExample', :path => '..'
10-
11-
# This is usually not needed but autolinking seems to be assuming that
12-
# node_modules is in '..'
13-
pod 'ReactTestApp-DevSupport', :path => '../../node_modules/react-native-test-app'
1410
end
1511
end

example/macos/Podfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ use_test_app! do |target|
66
target.app do
77
pod 'RNCAsyncStorage', :path => '../..'
88
pod 'AsyncStorageExample', :path => '..'
9-
10-
# This is usually not needed but autolinking seems to be assuming that
11-
# node_modules is in '..'
12-
pod 'ReactTestApp-DevSupport', :path => '../../node_modules/react-native-test-app'
139
end
1410

1511
target.ui_tests do

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"start:ios": "react-native run-ios --project-path example/ios",
4848
"start:macos": "react-native run-macos --project-path example/macos --scheme AsyncStorageExample",
4949
"start:web": "expo start:web",
50-
"start:windows": "react-native start --use-react-native-windows",
50+
"start:windows": "install-windows-test-app -p example/windows && react-native run-windows --root example --logging --no-packager --no-telemetry",
5151
"build:e2e:android": "scripts/android_e2e.sh 'build'",
5252
"build:e2e:ios": "scripts/ios_e2e.sh 'build'",
5353
"build:e2e:macos": "scripts/macos_e2e.sh 'build'",
@@ -70,29 +70,28 @@
7070
"devDependencies": {
7171
"@babel/core": "^7.12.0",
7272
"@babel/preset-env": "^7.1.6",
73-
"@expo/webpack-config": "^0.16.0",
7473
"@react-native-community/eslint-config": "^3.0.0",
7574
"@semantic-release/changelog": "^6.0.0",
7675
"@semantic-release/git": "^10.0.0",
7776
"@types/lodash": "^4.14.184",
7877
"@types/react": "^17.0.0",
79-
"@types/react-native": "^0.66.0",
78+
"@types/react-native": "^0.68.0",
8079
"concurrently": "^6.4.0",
8180
"detox": "^19.4.5",
82-
"eslint": "^7.0.0",
83-
"expo": "^43.0.0",
81+
"eslint": "^8.0.0",
82+
"expo": "^45.0.0",
8483
"jest": "^26.6.3",
8584
"jest-circus": "^26.6.1",
8685
"lodash": "^4.17.21",
8786
"prettier": "^2.5.1",
8887
"react": "17.0.2",
8988
"react-dom": "17.0.2",
90-
"react-native": "^0.66.0-0",
89+
"react-native": "^0.68.0",
9190
"react-native-builder-bob": "^0.18.0",
92-
"react-native-macos": "^0.66.0-0",
93-
"react-native-test-app": "^1.3.4",
91+
"react-native-macos": "^0.68.0",
92+
"react-native-test-app": "^1.6.10",
9493
"react-native-web": "^0.17.0",
95-
"react-native-windows": "^0.66.0-0",
94+
"react-native-windows": "^0.68.0",
9695
"react-test-renderer": "17.0.2",
9796
"semantic-release": "^19.0.0",
9897
"typescript": "^4.5.0"

0 commit comments

Comments
 (0)