Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

chore: update android target SDK to 30 #689

Merged
merged 4 commits into from
May 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

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()
jcenter()
}
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
}
Expand Down
6 changes: 4 additions & 2 deletions ios/rwallet/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -33,8 +37,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[self.window makeKeyAndVisible];


[FIRApp configure];
[RNFirebaseNotifications configure];

return YES;
}
Expand Down
38 changes: 0 additions & 38 deletions ios/rwallet/GoogleService-Info.plist

This file was deleted.