Merge pull request #3898 from kidroca/kidroca/update-async-storage

Switch async-storage repository
Expensify · Jul 9, 2021 · ee2f84f · ee2f84f
2 parents 263ce68 + 409c23c
commit ee2f84f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/__mocks__/@react-native-async-storage/async-storage.js b/__mocks__/@react-native-async-storage/async-storage.js
@@ -0,0 +1 @@
+export {default} from '@react-native-async-storage/async-storage/jest/async-storage-mock';
diff --git a/__mocks__/@react-native-community/async-storage.js b/__mocks__/@react-native-community/async-storage.js
diff --git a/android/build.gradle b/android/build.gradle
@@ -9,6 +9,7 @@ buildscript {
         androidXCore = "1.0.2"
         multiDexEnabled = true
         googlePlayServicesVersion = "17.0.0"
+        kotlinVersion = '1.4.21'
     }
     repositories {
         google()
@@ -20,6 +21,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -26,6 +26,7 @@ android.enableJetifier=true
 
 # Increase storage capacity (the default is 6 MB)
 AsyncStorage_db_size_in_MB=10
+AsyncStorage_useNextStorage=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.54.0

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,8 +1,6 @@
 rootProject.name = 'ExpensifyCash'
 include ':react-native-config'
 project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
-include ':@react-native-community_async-storage'
-project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 include ':react-native-plaid-link-sdk'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@formatjs/intl-numberformat": "^6.2.5",
     "@formatjs/intl-pluralrules": "^4.0.13",
     "@onfido/react-native-sdk": "^1.3.3",
-    "@react-native-community/async-storage": "^1.11.0",
+    "@react-native-async-storage/async-storage": "^1.15.5",
     "@react-native-community/cli": "4.13.1",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/netinfo": "^5.9.10",
@@ -80,7 +80,7 @@
     "react-native-image-picker": "^4.0.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.10.0",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#1e82e592032c6d0ede8e40f08beb6be790d149e8",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#84a27cdd03a39baa167058efc3379d9a477849dd",
     "react-native-pdf": "^6.2.2",
     "react-native-permissions": "^3.0.1",
     "react-native-picker-select": "8.0.4",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export {default} from '@react-native-async-storage/async-storage/jest/async-storage-mock';