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 0000000..4e4bb3e Binary files /dev/null and b/android/signing/keystore differ 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