chore: bump react-native to 0.68

.circleci/config.yml

@@ -284,6 +284,10 @@ workflows:
             - "Test: lint"
             - "Test: TypeScript"
             - "Test: Android unit"
+          filters:
+            branches:
+              only:
+                - temporarily-disabled--see-issue-840
       - "Release":
           requires:
             - "Test: iOS e2e"

.github/workflows/ci.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Set up Node.js
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3.3.0
         with:
-          node-version: 14
+          node-version: 16
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
       - name: Cache /.cache/yarn
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: .cache/yarn
           key: ${{ hashFiles('yarn.lock') }}
@@ -42,13 +42,13 @@ jobs:
       - name: Setup VSTest.console.exe
         uses: darenm/Setup-VSTest@v1
       - name: Set up Node.js
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3.3.0
         with:
-          node-version: 14
+          node-version: 16
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
       - name: Cache /.cache/yarn
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: .cache/yarn
           key: ${{ hashFiles('yarn.lock') }}
@@ -58,11 +58,7 @@ jobs:
       - name: Install Windows test app
         run: |
           yarn install-windows-test-app -p example/windows
-      - name: Install NuGet packages
-        run: |
-          nuget restore
-        working-directory: example/windows
       - name: Build
         run: |
-          MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts AsyncStorageExample.sln
+          yarn react-native run-windows --release --arch x64 --logging --no-packager --no-launch --no-deploy --msbuildprops "BundleEntryFile=index.ts" --no-telemetry
         working-directory: example/windows

android/build.gradle

@@ -42,12 +42,13 @@ buildscript {
             : '1.6.10'
 
     repositories {
-        google()
         mavenCentral()
+        google()
     }
     dependencies {
-        if (project == rootProject) {
-            classpath 'com.android.tools.build:gradle:4.2.2'
+        def projectExampleDir = Paths.get(project.projectDir.getParent(), "example", "android").toString()
+        def rootProjectDir = rootProject.projectDir.getPath()
+        if (projectExampleDir == rootProjectDir) {
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$asyncStorageKtVersion"
         }
     }

example/android/build.gradle

@@ -38,15 +38,12 @@ buildscript {
     println("[AsyncStorage] Using Next storage: " + nextStorageFlag)
 
     repositories {
-        google()
         mavenCentral()
-        jcenter()
+        google()
     }
 
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        // kotlinVersion is applied from react-native-test-app's dependencies.gradle script
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -55,7 +52,8 @@ allprojects {
         maven {
             url("$rootDir/../../node_modules/detox/Detox-android")
         }
-        jcenter()
+        mavenCentral()
+        google()
     }
     afterEvaluate { project ->
         def androidExtension = project.extensions.findByName('android')

example/android/gradle.properties

@@ -31,9 +31,19 @@ android.enableJetifier=true
 # Native defaults to. To disable Flipper, set it to `false`.
 #FLIPPER_VERSION=0.125.0
 
+# Enable Fabric at runtime.
+#USE_FABRIC=1
+
+# Enable new architecture, i.e. Fabric + TurboModule - implies USE_FABRIC=1.
+# Note that this is incompatible with web debugging.
+#newArchEnabled=true
+
 # Uncomment the line below if building react-native from source
 #ANDROID_NDK_VERSION=21.4.7075529
 
+# Version of Kotlin to build against.
+KOTLIN_VERSION=1.6.21
+
 # This is an example of how you can change default DB size (6MB) to 10MB
 #AsyncStorage_db_size_in_MB=10
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/ios/Podfile

@@ -7,9 +7,5 @@ use_test_app! do |target|
   target.app do
     pod 'RNCAsyncStorage', :path => '../..'
     pod 'AsyncStorageExample', :path => '..'
-
-    # This is usually not needed but autolinking seems to be assuming that
-    # node_modules is in '..'
-    pod 'ReactTestApp-DevSupport', :path => '../../node_modules/react-native-test-app'
   end
 end

example/macos/Podfile

@@ -6,10 +6,6 @@ use_test_app! do |target|
   target.app do
     pod 'RNCAsyncStorage', :path => '../..'
     pod 'AsyncStorageExample', :path => '..'
-
-    # This is usually not needed but autolinking seems to be assuming that
-    # node_modules is in '..'
-    pod 'ReactTestApp-DevSupport', :path => '../../node_modules/react-native-test-app'
   end
 
   target.ui_tests do

package.json

@@ -47,7 +47,7 @@
     "start:ios": "react-native run-ios --project-path example/ios",
     "start:macos": "react-native run-macos --project-path example/macos --scheme AsyncStorageExample",
     "start:web": "expo start:web",
-    "start:windows": "react-native start --use-react-native-windows",
+    "start:windows": "install-windows-test-app -p example/windows && react-native run-windows --root example --logging --no-packager --no-telemetry",
     "build:e2e:android": "scripts/android_e2e.sh 'build'",
     "build:e2e:ios": "scripts/ios_e2e.sh 'build'",
     "build:e2e:macos": "scripts/macos_e2e.sh 'build'",
@@ -70,29 +70,28 @@
   "devDependencies": {
     "@babel/core": "^7.12.0",
     "@babel/preset-env": "^7.1.6",
-    "@expo/webpack-config": "^0.16.0",
     "@react-native-community/eslint-config": "^3.0.0",
     "@semantic-release/changelog": "^6.0.0",
     "@semantic-release/git": "^10.0.0",
     "@types/lodash": "^4.14.184",
     "@types/react": "^17.0.0",
-    "@types/react-native": "^0.66.0",
+    "@types/react-native": "^0.68.0",
     "concurrently": "^6.4.0",
     "detox": "^19.4.5",
-    "eslint": "^7.0.0",
-    "expo": "^43.0.0",
+    "eslint": "^8.0.0",
+    "expo": "^45.0.0",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.1",
     "lodash": "^4.17.21",
     "prettier": "^2.5.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-native": "^0.66.0-0",
+    "react-native": "^0.68.0",
     "react-native-builder-bob": "^0.18.0",
-    "react-native-macos": "^0.66.0-0",
-    "react-native-test-app": "^1.3.4",
+    "react-native-macos": "^0.68.0",
+    "react-native-test-app": "^1.6.10",
     "react-native-web": "^0.17.0",
-    "react-native-windows": "^0.66.0-0",
+    "react-native-windows": "^0.68.0",
     "react-test-renderer": "17.0.2",
     "semantic-release": "^19.0.0",
     "typescript": "^4.5.0"