From 6b2dd5e25d43c814512138c81fdbf6bf9fdd6443 Mon Sep 17 00:00:00 2001 From: Robert Jeutter Date: Mon, 21 Jun 2021 14:21:16 +0200 Subject: [PATCH] create apk build in android studio --- android/.idea/jarRepositories.xml | 30 ++++++++++++++++++ android/.idea/jsonCatalog.xml | 6 ++++ android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 4 +-- .../shaker/app}/MainActivity.java | 2 +- android/app/src/main/res/values/strings.xml | 4 +-- android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 5 +-- android/signing/keystore | Bin 0 -> 4685 bytes android/variables.gradle | 8 ++--- capacitor.config.json | 25 ++++++++------- 11 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 android/.idea/jarRepositories.xml create mode 100644 android/.idea/jsonCatalog.xml rename android/app/src/main/java/{io/ionic/starter => cocktail/shaker/app}/MainActivity.java (94%) create mode 100644 android/signing/keystore diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml new file mode 100644 index 0000000..e34606c --- /dev/null +++ b/android/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/.idea/jsonCatalog.xml b/android/.idea/jsonCatalog.xml new file mode 100644 index 0000000..d174845 --- /dev/null +++ b/android/.idea/jsonCatalog.xml @@ -0,0 +1,6 @@ + + + + true + + \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 983b553..c1425dd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "io.ionic.starter" + applicationId "cocktail.shaker.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bc7fb42..c286546 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="cocktail.shaker.app"> diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android/app/src/main/java/cocktail/shaker/app/MainActivity.java similarity index 94% rename from android/app/src/main/java/io/ionic/starter/MainActivity.java rename to android/app/src/main/java/cocktail/shaker/app/MainActivity.java index 9fc9756..f08d4a5 100644 --- a/android/app/src/main/java/io/ionic/starter/MainActivity.java +++ b/android/app/src/main/java/cocktail/shaker/app/MainActivity.java @@ -1,4 +1,4 @@ -package io.ionic.starter; +package cocktail.shaker.app; import android.os.Bundle; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 3a38d83..89a9ad5 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -2,6 +2,6 @@ cocktailShakerApp cocktailShakerApp - io.ionic.starter - io.ionic.starter + cocktail.shaker.app + cocktail.shaker.app diff --git a/android/build.gradle b/android/build.gradle index fc069ba..f49c81d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.google.gms:google-services:4.3.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0ebb310..d3a7f03 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Jun 21 13:30:33 CEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/android/signing/keystore b/android/signing/keystore new file mode 100644 index 0000000000000000000000000000000000000000..4e4bb3e5ec48c12cb5ce3d5f11c5ee8925c627d3 GIT binary patch literal 4685 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 S*9CdfcdJPiJbc{fy#E09d$~ja literal 0 HcmV?d00001 diff --git a/android/variables.gradle b/android/variables.gradle index 42ed435..4b56904 100644 --- a/android/variables.gradle +++ b/android/variables.gradle @@ -2,7 +2,7 @@ ext { minSdkVersion = 21 compileSdkVersion = 29 targetSdkVersion = 29 - androidxAppCompatVersion = '1.1.0' + androidxAppCompatVersion = '1.3.0' androidxCoreVersion = '1.2.0' androidxMaterialVersion = '1.1.0-rc02' androidxBrowserVersion = '1.2.0' @@ -10,8 +10,8 @@ ext { androidxExifInterfaceVersion = '1.2.0' firebaseMessagingVersion = '20.1.2' playServicesLocationVersion = '17.0.0' - junitVersion = '4.12' - androidxJunitVersion = '1.1.1' - androidxEspressoCoreVersion = '3.2.0' + junitVersion = '4.13.2' + androidxJunitVersion = '1.1.2' + androidxEspressoCoreVersion = '3.3.0' cordovaAndroidVersion = '7.0.0' } \ No newline at end of file diff --git a/capacitor.config.json b/capacitor.config.json index 7f5c5f3..c11cce2 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -1,13 +1,14 @@ { - "appId": "io.ionic.starter", - "appName": "cocktailShakerApp", - "bundledWebRuntime": false, - "npmClient": "yarn", - "webDir": "dist", - "plugins": { - "SplashScreen": { - "launchShowDuration": 0 - } - }, - "cordova": {} -} + "appId": "cocktail.shaker.app", + "appName": "cocktailShakerApp", + "bundledWebRuntime": false, + "npmClient": "yarn", + "webDir": "dist", + "plugins": { + "SplashScreen": { + "launchShowDuration": 0 + } + }, + "cordova": {}, + "linuxAndroidStudioPath": "YourPathTo/android-studio/bin/studio.sh" +} \ No newline at end of file