rn: use new AsyncStorage package

It was extracted from the RN core to a community maintained package.
2019-05-08 14:51:14 +02:00 · 2019-05-08 14:51:14 +02:00 · b45a5da6e2
parent 2fad9f9ba8
commit b45a5da6e2
8 changed files with 41 additions and 26 deletions
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@ -63,6 +63,7 @@ dependencies {
    implementation project(':react-native-vector-icons')
    implementation project(':react-native-webrtc')
    implementation project(':react-native-webview')
+    implementation project(':@react-native-community_async-storage')

    testImplementation 'junit:junit:4.12'
 }
@ -206,7 +207,7 @@ publishing {
                    def groupId = it.moduleGroup
                    def artifactId = it.moduleName

-                    if (artifactId.startsWith('react-native-')
+                    if ((artifactId.startsWith('react-native-') || artifactId.startsWith('@react-native-community'))
                            && groupId.equals('jitsi-meet')) {
                        groupId = rootProject.ext.moduleGroupId
                    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@ -147,6 +147,7 @@ class ReactInstanceManagerHolder {
                new com.oblador.vectoricons.VectorIconsPackage(),
                new com.ocetnik.timer.BackgroundTimerPackage(),
                new com.oney.WebRTCModule.WebRTCModulePackage(),
+                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                new com.reactnativecommunity.webview.RNCWebViewPackage(),
                new com.rnimmersive.RNImmersivePackage(),
                new com.zmxv.RNSound.RNSoundPackage(),
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -23,3 +23,5 @@ include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/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')
--- a/ios/Podfile
+++ b/ios/Podfile
@ -14,6 +14,9 @@ end
 target 'JitsiMeet' do
  project 'sdk/sdk.xcodeproj'

+  # React Native and its dependencies
+  #
+
  pod 'React', :path => '../node_modules/react-native', :subspecs => [
    'Core',
    'CxxBridge',
@ -27,35 +30,31 @@ target 'JitsiMeet' do
    'RCTWebSocket',
  ]
  pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'

-  pod 'DoubleConversion',
-    :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog',
-    :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly',
-    :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  # React Native plugins
+  #

-  pod 'Amplitude-iOS', '~> 4.0.4'
-  pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
-
-  pod 'react-native-background-timer',
-    :path => '../node_modules/react-native-background-timer'
-  pod 'react-native-calendar-events',
-    :path => '../node_modules/react-native-calendar-events'
-  pod 'react-native-fast-image',
-    :path => '../node_modules/react-native-fast-image'
-  pod 'react-native-keep-awake',
-    :path => '../node_modules/react-native-keep-awake'
-  pod 'react-native-webview',
-    :path => '../node_modules/react-native-webview'
-  pod 'BVLinearGradient',
-    :path => '../node_modules/react-native-linear-gradient'
+  pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
+  pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
+  pod 'react-native-fast-image', :path => '../node_modules/react-native-fast-image'
+  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
+  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
-  pod 'RNGoogleSignin',
-    :path => '../node_modules/react-native-google-signin'
+  pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
+  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
+  pod 'RNGoogleSignin', :path => '../node_modules/react-native-google-signin'
  pod 'RNSound', :path => '../node_modules/react-native-sound'
  pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
+
+  # Native pod dependencies
+  #
+
+  pod 'Amplitude-iOS', '~> 4.0.4'
+  pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
 end

 post_install do |installer|
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -148,6 +148,8 @@ PODS:
    - React/Core
    - React/fishhook
    - React/RCTBlob
+  - RNCAsyncStorage (1.3.4):
+    - React
  - RNGoogleSignin (1.0.2):
    - GoogleSignIn
    - React
@ -193,6 +195,7 @@ DEPENDENCIES:
  - React/RCTNetwork (from `../node_modules/react-native`)
  - React/RCTText (from `../node_modules/react-native`)
  - React/RCTWebSocket (from `../node_modules/react-native`)
+  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
  - RNGoogleSignin (from `../node_modules/react-native-google-signin`)
  - RNSound (from `../node_modules/react-native-sound`)
  - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
@ -244,6 +247,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-webrtc"
  react-native-webview:
    :path: "../node_modules/react-native-webview"
+  RNCAsyncStorage:
+    :path: "../node_modules/@react-native-community/async-storage"
  RNGoogleSignin:
    :path: "../node_modules/react-native-google-signin"
  RNSound:
@ -285,6 +290,7 @@ SPEC CHECKSUMS:
  react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
  react-native-webrtc: 90a847d19deb2d7323fef8cc89ca12b8995fbc90
  react-native-webview: a95842e3f351a6d2c8bc8bcc9eab689c7e7e5ad4
+  RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
  RNGoogleSignin: 361174d9a3090d295b06257162b560d8efc8a6ed
  RNSound: e157320f503bdd4f4ee6d8542e948d54f90c3c3a
  RNVectorIcons: d819334932bcda3332deb3d2c8ea4d069e0b98f9
@ -292,6 +298,6 @@ SPEC CHECKSUMS:
  SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
  yoga: 2e571f113e8cbeb0eb752aeebc86c1bfe7a8200c

-PODFILE CHECKSUM: 531b5a1ff1f50f5c56208c3f53bae152a71e213e
+PODFILE CHECKSUM: b55338cc43312051ed83f8d9c6aadbd8c9402e6a

 COCOAPODS: 1.6.1
--- a/package-lock.json
+++ b/package-lock.json
@ -2448,6 +2448,11 @@
        "isomorphic-fetch": "^2.2.1"
      }
    },
+    "@react-native-community/async-storage": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.3.4.tgz",
+      "integrity": "sha512-fJmzL27x0BEjhmMXPnDPnUNCZK7bph+NBVCfAz9fzHzAamaiOkdUwuL3PvE4Oj4Kw4knP8ocw5VRDGorAidZ2g=="
+    },
    "@react-native-community/cli": {
      "version": "1.9.2",
      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-1.9.2.tgz",
--- a/package.json
+++ b/package.json
@ -34,6 +34,7 @@
    "@atlaskit/toggle": "5.0.14",
    "@atlaskit/tooltip": "12.1.13",
    "@microsoft/microsoft-graph-client": "1.1.0",
+    "@react-native-community/async-storage": "1.3.4",
    "@webcomponents/url": "0.7.1",
    "amplitude-js": "4.5.2",
    "bc-css-flags": "3.0.0",
--- a/react/features/base/storage/native/Storage.js
+++ b/react/features/base/storage/native/Storage.js
@ -1,4 +1,4 @@
-import { AsyncStorage } from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';

 /**
 * A Web Sorage API implementation used for polyfilling