From 2eb1645ba66e7f832bc3bcbb73d992e4fc2a1b64 Mon Sep 17 00:00:00 2001 From: Patricio Date: Wed, 19 May 2021 10:30:19 -0300 Subject: [PATCH 1/4] parent a067354694724b2a60e250f6db31cf0aed84feb1 author Patricio 1621431019 -0300 committer Patricio 1621434365 -0300 chore: upgrade android target SDK to 30 --- .gitignore | 4 ++ android/build.gradle | 12 ++--- ios/rwallet/AppDelegate.m | 6 ++- ios/rwallet/GoogleService-Info.plist | 38 --------------- package-lock.json | 72 ++++++++++++++++++++++++++++ package.json | 1 + 6 files changed, 87 insertions(+), 46 deletions(-) delete mode 100644 ios/rwallet/GoogleService-Info.plist diff --git a/.gitignore b/.gitignore index 97ee845d5..cff88b0fe 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,10 @@ android/keystores/ android/app/release/ android/app/google-services.json +#ios +ios/rwallet/GoogleService-Info.plist +/ios/rwallet/GoogleService-Info.plist + # node.js # node_modules/ diff --git a/android/build.gradle b/android/build.gradle index 1d6e6571d..df72a18e1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,11 +2,11 @@ buildscript { ext { - minSdkVersion = 16 - compileSdkVersion = 29 - buildToolsVersion = "29.0.2" - targetSdkVersion = 29 - supportLibVersion = "29.0.0" + minSdkVersion = 16 + targetSdkVersion = 30 + compileSdkVersion = 30 + buildToolsVersion = "30.0.2" + supportLibVersion = "30.0.0" } repositories { google() @@ -14,7 +14,7 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:3.4.0") - classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.google.gms:google-services:4.3.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/ios/rwallet/AppDelegate.m b/ios/rwallet/AppDelegate.m index 1143423cf..b1df7b578 100644 --- a/ios/rwallet/AppDelegate.m +++ b/ios/rwallet/AppDelegate.m @@ -19,6 +19,10 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + if ([FIRApp defaultApp] == nil) { + [FIRApp configure]; + } + [RNFirebaseNotifications configure]; RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"rwallet" @@ -33,8 +37,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [self.window makeKeyAndVisible]; - [FIRApp configure]; - [RNFirebaseNotifications configure]; return YES; } diff --git a/ios/rwallet/GoogleService-Info.plist b/ios/rwallet/GoogleService-Info.plist deleted file mode 100644 index 1d09e6c88..000000000 --- a/ios/rwallet/GoogleService-Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CLIENT_ID - 1015605870697-5rplra6b6eovje44u6cfbsdr27g3pce9.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.1015605870697-5rplra6b6eovje44u6cfbsdr27g3pce9 - ANDROID_CLIENT_ID - 1015605870697-10ic72m9vsjojr3ln7gdlsrmqhtek5u3.apps.googleusercontent.com - API_KEY - AIzaSyA3gMHYFj-zkjj7JiEa-rEdbG9C-x8Fzns - GCM_SENDER_ID - 1015605870697 - PLIST_VERSION - 1 - BUNDLE_ID - com.rsk.rwallet.reactnative - PROJECT_ID - rwallet-40420 - STORAGE_BUCKET - rwallet-40420.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:1015605870697:ios:d3e7b8ab79cfbbf1b922f8 - DATABASE_URL - https://rwallet-40420.firebaseio.com - - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index eb68c7c77..668cbd736 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1333,6 +1333,15 @@ "resolved": "https://registry.npmjs.org/@react-native-community/viewpager/-/viewpager-1.1.7.tgz", "integrity": "sha512-k9v2KJtAprNPq7IZmedD2VLMePvPW+ohX3uDnkpoKritBji+/RtRmTKrdtPi3Uvp0toq/KtPttAds1dr7AZNpw==" }, + "@react-native-firebase/app": { + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/@react-native-firebase/app/-/app-11.5.0.tgz", + "integrity": "sha512-Jz5CBhqkybxHjTFr5V0K+Jq2YivzPbu9exSze61/z1zSaIfBhR4G38wmHk44VWAl+PEX8GaYy9yfT69tLiCERA==", + "requires": { + "opencollective-postinstall": "^2.0.1", + "superstruct": "^0.6.2" + } + }, "@react-native-picker/picker": { "version": "1.9.11", "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-1.9.11.tgz", @@ -3554,6 +3563,27 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz", "integrity": "sha1-YT+2hjmyaklKxTJT4Vsaa9iK2oU=" }, + "clone-deep": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", + "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", + "requires": { + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" + }, + "dependencies": { + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "^1.0.1" + } + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -11225,6 +11255,22 @@ } } }, + "mixin-object": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", + "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", + "requires": { + "for-in": "^0.1.3", + "is-extendable": "^0.1.1" + }, + "dependencies": { + "for-in": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", + "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" + } + } + }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -14683,6 +14729,23 @@ } } }, + "shallow-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", + "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "requires": { + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -15246,6 +15309,15 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, + "superstruct": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.6.2.tgz", + "integrity": "sha512-lvA97MFAJng3rfjcafT/zGTSWm6Tbpk++DP6It4Qg7oNaeM+2tdJMuVgGje21/bIpBEs6iQql1PJH6dKTjl4Ig==", + "requires": { + "clone-deep": "^2.0.1", + "kind-of": "^6.0.1" + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", diff --git a/package.json b/package.json index 9f4663732..7170adae7 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@react-native-community/blur": "^3.6.0", "@react-native-community/slider": "^1.1.4", "@react-native-community/toolbar-android": "^0.1.0-rc.2", + "@react-native-firebase/app": "^11.5.0", "@rsksmart/rns-resolver.js": "^1.0.0", "@rsksmart/rsk3": "^0.3.2", "@tradle/react-native-http": "^2.0.1", From cdc48a4e3ac2d0e7dd4b76c2003f62e1ced8d75b Mon Sep 17 00:00:00 2001 From: Patricio Date: Wed, 19 May 2021 15:01:13 -0300 Subject: [PATCH 2/4] fix: remove firebase upgrade, no need in the scope of this PR --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 7170adae7..9f4663732 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "@react-native-community/blur": "^3.6.0", "@react-native-community/slider": "^1.1.4", "@react-native-community/toolbar-android": "^0.1.0-rc.2", - "@react-native-firebase/app": "^11.5.0", "@rsksmart/rns-resolver.js": "^1.0.0", "@rsksmart/rsk3": "^0.3.2", "@tradle/react-native-http": "^2.0.1", From 44503df03eb45a8523f03f8361d4ab27b9a72705 Mon Sep 17 00:00:00 2001 From: Patricio Date: Wed, 19 May 2021 15:02:59 -0300 Subject: [PATCH 3/4] fix: remove firebase upgrade, no need in the scope of this PR --- package-lock.json | 72 ----------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index 668cbd736..eb68c7c77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1333,15 +1333,6 @@ "resolved": "https://registry.npmjs.org/@react-native-community/viewpager/-/viewpager-1.1.7.tgz", "integrity": "sha512-k9v2KJtAprNPq7IZmedD2VLMePvPW+ohX3uDnkpoKritBji+/RtRmTKrdtPi3Uvp0toq/KtPttAds1dr7AZNpw==" }, - "@react-native-firebase/app": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@react-native-firebase/app/-/app-11.5.0.tgz", - "integrity": "sha512-Jz5CBhqkybxHjTFr5V0K+Jq2YivzPbu9exSze61/z1zSaIfBhR4G38wmHk44VWAl+PEX8GaYy9yfT69tLiCERA==", - "requires": { - "opencollective-postinstall": "^2.0.1", - "superstruct": "^0.6.2" - } - }, "@react-native-picker/picker": { "version": "1.9.11", "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-1.9.11.tgz", @@ -3563,27 +3554,6 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz", "integrity": "sha1-YT+2hjmyaklKxTJT4Vsaa9iK2oU=" }, - "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" - }, - "dependencies": { - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "requires": { - "for-in": "^1.0.1" - } - } - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -11255,22 +11225,6 @@ } } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" - } - } - }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -14729,23 +14683,6 @@ } } }, - "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", - "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -15309,15 +15246,6 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, - "superstruct": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.6.2.tgz", - "integrity": "sha512-lvA97MFAJng3rfjcafT/zGTSWm6Tbpk++DP6It4Qg7oNaeM+2tdJMuVgGje21/bIpBEs6iQql1PJH6dKTjl4Ig==", - "requires": { - "clone-deep": "^2.0.1", - "kind-of": "^6.0.1" - } - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", From 8e1da77f006db5386341306f17fe5f20acd5c6d8 Mon Sep 17 00:00:00 2001 From: Patricio Date: Wed, 19 May 2021 15:31:40 -0300 Subject: [PATCH 4/4] chore: update readme --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 17945d83f..c5acc02c3 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a multi-cryptocurrency wallet application. Supports both english and spa ## Prerequisite ### To run on Android -1. In order to run this App in Android Simulator, **Android Studio** needs to be installed with Android SKD 10 (Api level 29). Please refer to [https://developer.android.com/studio](https://developer.android.com/studio) +1. In order to run this App in Android Simulator, **Android Studio** needs to be installed with Android SKD 11 (Api level 30). Please refer to [https://developer.android.com/studio](https://developer.android.com/studio) 1. Open Android Studio, create a device via `Tools > AVD Manager > Create Virtual Device`. After downloading required dependencies, start the device by clicking on Play icon. 1. Now we are testing if you can invoke `adb` in terminial. This is for running rWallet Android App on Android virtual device. 1. Since we already have Android Studio installed we can add `platform-tools` to path @@ -21,11 +21,6 @@ This is a multi-cryptocurrency wallet application. Supports both english and spa List of devices attached emulator-5554 device ``` - -**Note:** When `syncing project with gradle files` using Android SKD 11, it throws the following error: -``` -No variants found for ':@imstar15_react-native-firebase'. Check build files to ensure at least one variant exists. at: -``` ### To run on iOS Devices 1. XCode needs to be installed (v11.x). iOS simulator will be installed along with XCode.