From 349c5f23cfa89dc96a705185cfd8620dd3ad5c77 Mon Sep 17 00:00:00 2001 From: franck-x Date: Fri, 2 Sep 2022 15:18:05 +0200 Subject: [PATCH 1/3] build: upgrade gradle to 7.2.2 --- android/app/build.gradle | 3 ++- android/app/src/main/AndroidManifest.xml | 3 +-- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 601cc2c..435fed5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,8 +1,9 @@ apply plugin: 'com.android.application' android { + namespace 'info.varden.hauk' + compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { applicationId "info.varden.hauk" minSdkVersion 23 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2ff1504..c200171 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/android/build.gradle b/android/build.gradle index 95a3996..f817a65 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index fff0b73..c790517 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip From ff9acdabfe8d151c775953b97243696f2094bd31 Mon Sep 17 00:00:00 2001 From: franck-x Date: Fri, 2 Sep 2022 15:19:55 +0200 Subject: [PATCH 2/3] build: upgrade compileSdkVersion and targetSdkVersion to 33 --- android/app/build.gradle | 5 +++-- android/app/src/main/AndroidManifest.xml | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 435fed5..da3a7aa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,14 +3,15 @@ apply plugin: 'com.android.application' android { namespace 'info.varden.hauk' - compileSdkVersion 29 + compileSdkVersion 33 defaultConfig { applicationId "info.varden.hauk" minSdkVersion 23 - targetSdkVersion 29 + targetSdkVersion 33 versionCode 13 versionName "1.6.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c200171..b6f219f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ + @@ -30,7 +31,8 @@ android:launchMode="singleTop" android:screenOrientation="portrait" android:windowSoftInputMode="stateHidden" - android:theme="@style/HomeTheme"> + android:theme="@style/HomeTheme" + android:exported="true"> From f42949b2e283cf94b01d6c9486024955c0779870 Mon Sep 17 00:00:00 2001 From: franck-x Date: Fri, 2 Sep 2022 15:21:22 +0200 Subject: [PATCH 3/3] build: upgrade dependencies --- android/app/build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index da3a7aa..fa196a1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,10 +23,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.preference:preference:1.1.1' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + implementation 'androidx.preference:preference:1.2.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' }