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.
This commit is contained in:
dece 2023-01-04 18:25:12 +01:00
parent f7b1b9072c
commit 45813c576a
6 changed files with 21 additions and 20 deletions

View file

@ -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'
}

View file

@ -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(

View file

@ -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="" />
</LinearLayout>

View file

@ -10,7 +10,7 @@
<item name="colorSecondaryVariant">@color/second_accent_dark</item>
<item name="colorOnSecondary">@color/text</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
<item name="android:windowBackground">@color/background</item>
<item name="android:progressBackgroundTint">?attr/colorSecondaryVariant</item>

View file

@ -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'
}
}

View file

@ -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