From 45813c576a2d76c40ae1d1dc137dff3cd5025e25 Mon Sep 17 00:00:00 2001 From: dece Date: Wed, 4 Jan 2023 18:25:12 +0100 Subject: [PATCH] gradle: update targetSdk to 33 and fix minor stuff You know, the usual "I forgot this project for 5 seconds and now I have to spend 20 minutes to stop Gradle from drowning me in warnings" commit. --- app/build.gradle | 24 +++++++++---------- .../dev/lowrespalmtree/comet/Identities.kt | 4 ++-- app/src/main/res/layout/dialog_input.xml | 3 ++- app/src/main/res/values/themes.xml | 2 +- build.gradle | 6 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6809395..ebe4166 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ plugins { } android { - compileSdk 31 + compileSdk 33 defaultConfig { applicationId "dev.lowrespalmtree.comet" minSdk 24 - targetSdk 31 + targetSdk 33 versionCode 1 versionName "0.1.0" @@ -45,14 +45,14 @@ android { } dependencies { - def nav_version = "2.4.0" - def room_version = "2.4.1" - implementation 'androidx.appcompat:appcompat:1.4.1' + def nav_version = "2.5.3" + def room_version = "2.4.3" + implementation 'androidx.appcompat:appcompat:1.5.1' implementation "androidx.cardview:cardview:1.0.0" - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.fragment:fragment-ktx:1.4.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.fragment:fragment-ktx:1.5.5' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" @@ -60,9 +60,9 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.material:material:1.7.0' kapt "androidx.room:room-compiler:$room_version" testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } \ No newline at end of file diff --git a/app/src/main/java/dev/lowrespalmtree/comet/Identities.kt b/app/src/main/java/dev/lowrespalmtree/comet/Identities.kt index 4424dbd..fc6941b 100644 --- a/app/src/main/java/dev/lowrespalmtree/comet/Identities.kt +++ b/app/src/main/java/dev/lowrespalmtree/comet/Identities.kt @@ -9,10 +9,10 @@ import java.security.KeyStore import javax.security.auth.x500.X500Principal object Identities { - const val PROVIDER = "AndroidKeyStore" + private const val PROVIDER = "AndroidKeyStore" private const val TAG = "Identities" - val keyStore by lazy { KeyStore.getInstance(PROVIDER).apply { load(null) } } + val keyStore: KeyStore by lazy { KeyStore.getInstance(PROVIDER).apply { load(null) } } @Entity data class Identity( diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml index af768ff..ef4e6c3 100644 --- a/app/src/main/res/layout/dialog_input.xml +++ b/app/src/main/res/layout/dialog_input.xml @@ -9,6 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:inputType="text" /> + android:inputType="text" + android:autofillHints="" /> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 3f2c213..7026f03 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -10,7 +10,7 @@ @color/second_accent_dark @color/text - ?attr/colorPrimaryVariant + ?attr/colorPrimaryVariant @color/background ?attr/colorSecondaryVariant diff --git a/build.gradle b/build.gradle index d7baa0f..91a09ec 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10' - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" + classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 689f280..8a19571 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Nov 29 12:01:36 CET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME