fix(apple): backwards compatibility

Author: krizzu

examples/react-native/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AsyncStorage (3.0.0):
+  - AsyncStorage (2.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2023,7 +2023,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AsyncStorage: 252b24e7093dc051978e2cc9d0b73b0868ab9b0f
+  AsyncStorage: 4b7c60df2215d851c02365540b8da2ecd8bd20ae
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6

examples/react-native/macos/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AsyncStorage (3.0.0):
+  - AsyncStorage (2.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2023,7 +2023,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-macos/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AsyncStorage: 252b24e7093dc051978e2cc9d0b73b0868ab9b0f
+  AsyncStorage: 4b7c60df2215d851c02365540b8da2ecd8bd20ae
   boost: 7d49a506d1ac47358fea28558d184dd6431170ca
   DoubleConversion: 10f51d3e1238973c033faac2d84c0ea114942f53
   fast_float: 44983b3bddb2d2ed3021a98be86f60ec8abc9ffd

packages/async-storage/apple/AsyncStorage.h

@@ -1,7 +1,9 @@
-#import <AsyncStorageSpec/AsyncStorageSpec.h>
-
 #import <React/RCTBridgeModule.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <AsyncStorageSpec/AsyncStorageSpec.h>
+#endif
+
 @interface AsyncStorage : NSObject <
 #ifdef RCT_NEW_ARCH_ENABLED
                               NativeAsyncStorageSpec

packages/async-storage/apple/AsyncStorage.mm

@@ -6,48 +6,52 @@
 @implementation AsyncStorage
 RCT_EXPORT_MODULE(RNAsyncStorage)
 
-- (void)getValues:(nonnull NSString *)dbName
-             keys:(nonnull NSArray *)keys
-          resolve:(nonnull RCTPromiseResolveBlock)resolve
-           reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(getValues
+                  : (nonnull NSString *)dbName keys
+                  : (nonnull NSArray *)keys resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
-
     RNStorage *db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db getWithKeys:keys resolver:resolve rejecter:reject];
 }
 
-- (void)setValues:(nonnull NSString *)dbName
-           values:(nonnull NSArray<NSDictionary *> *)values
-          resolve:(nonnull RCTPromiseResolveBlock)resolve
-           reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(setValues
+                  : (nonnull NSString *)dbName values
+                  : (nonnull NSArray<NSDictionary *> *)values resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
 
     RNStorage *db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db setWithValues:values resolver:resolve rejecter:reject];
 }
 
-- (void)removeValues:(nonnull NSString *)dbName
-                keys:(nonnull NSArray *)keys
-             resolve:(nonnull RCTPromiseResolveBlock)resolve
-              reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(removeValues
+                  : (nonnull NSString *)dbName keys
+                  : (nonnull NSArray *)keys resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
 
     RNStorage *db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db removeWithKeys:keys resolver:resolve rejecter:reject];
 }
 
-- (void)clearStorage:(nonnull NSString *)dbName
-             resolve:(nonnull RCTPromiseResolveBlock)resolve
-              reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(clearStorage
+                  : (nonnull NSString *)dbName resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
 
     RNStorage *db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db clearWithResolver:resolve rejecter:reject];
 }
 
-- (void)getKeys:(nonnull NSString *)dbName
-        resolve:(nonnull RCTPromiseResolveBlock)resolve
-         reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(getKeys
+                  : (nonnull NSString *)dbName resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
 
     RNStorage *db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
@@ -56,9 +60,10 @@ - (void)getKeys:(nonnull NSString *)dbName
 
 #pragma mark - Legacy Storage
 
-- (void)legacy_multiGet:(nonnull NSArray *)keys
-                resolve:(nonnull RCTPromiseResolveBlock)resolve
-                 reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_multiGet
+                  : (nonnull NSArray *)keys resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
     RNCAsyncStorage *legacy = [RNCAsyncStorage sharedInstance];
 
@@ -87,9 +92,10 @@ - (void)legacy_multiGet:(nonnull NSArray *)keys
     });
 }
 
-- (void)legacy_multiSet:(nonnull NSArray *)kvPairs
-                resolve:(nonnull RCTPromiseResolveBlock)resolve
-                 reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_multiSet
+                  : (nonnull NSArray *)kvPairs resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
     RNCAsyncStorage *legacy = [RNCAsyncStorage sharedInstance];
 
@@ -110,9 +116,10 @@ - (void)legacy_multiSet:(nonnull NSArray *)kvPairs
     });
 }
 
-- (void)legacy_multiRemove:(nonnull NSArray *)keys
-                   resolve:(nonnull RCTPromiseResolveBlock)resolve
-                    reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_multiRemove
+                  : (nonnull NSArray *)keys resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
     RNCAsyncStorage *legacy = [RNCAsyncStorage sharedInstance];
 
@@ -130,8 +137,9 @@ - (void)legacy_multiRemove:(nonnull NSArray *)keys
     });
 }
 
-- (void)legacy_getAllKeys:(nonnull RCTPromiseResolveBlock)resolve
-                   reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_getAllKeys
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
     RNCAsyncStorage *legacy = [RNCAsyncStorage sharedInstance];
 
@@ -149,8 +157,9 @@ - (void)legacy_getAllKeys:(nonnull RCTPromiseResolveBlock)resolve
     });
 }
 
-- (void)legacy_clear:(nonnull RCTPromiseResolveBlock)resolve
-              reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_clear
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
 
     RNCAsyncStorage *legacy = [RNCAsyncStorage sharedInstance];
@@ -169,9 +178,10 @@ - (void)legacy_clear:(nonnull RCTPromiseResolveBlock)resolve
     });
 }
 
-- (void)legacy_multiMerge:(nonnull NSArray *)kvPairs
-                  resolve:(nonnull RCTPromiseResolveBlock)resolve
-                   reject:(nonnull RCTPromiseRejectBlock)reject
+RCT_EXPORT_METHOD(legacy_multiMerge
+                  : (nonnull NSArray *)kvPairs resolve
+                  : (nonnull RCTPromiseResolveBlock)resolve reject
+                  : (nonnull RCTPromiseRejectBlock)reject)
 {
     // merge is removed
     resolve(nil);