diff --git a/app/build.gradle b/app/build.gradle index f1eb6f9..b2c879b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { targetSdkVersion 33 versionCode versionProperties["versionCode"].toInteger() versionName "${versionMajor}.${versionMinor}.${versionProperties["versionCode"].toInteger()}" - resConfigs 'de', 'en' + resourceConfigurations += ['de', 'en'] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables { @@ -68,7 +68,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.3.2" + kotlinCompilerExtensionVersion = "1.4.7" } compileOptions { @@ -89,7 +89,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.0' implementation 'androidx.appcompat:appcompat:1.6.0-rc01' implementation "androidx.compose.material3:material3:1.0.1" implementation 'com.google.android.play:core-ktx:1.8.1' @@ -99,32 +99,32 @@ dependencies { implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.fragment:fragment-ktx:1.5.5' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' + implementation 'androidx.fragment:fragment-ktx:1.5.7' implementation 'androidx.preference:preference-ktx:1.2.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.compose.material:material-icons-extended:1.3.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.compose.material:material-icons-extended:1.4.3' implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0" - implementation 'androidx.activity:activity-compose:1.6.1' - implementation "androidx.compose.ui:ui:1.3.3" - implementation "androidx.compose.ui:ui-tooling-preview:1.3.3" - implementation "androidx.compose.runtime:runtime-livedata:1.3.3" + implementation 'androidx.activity:activity-compose:1.7.1' + implementation "androidx.compose.ui:ui:1.4.3" + implementation "androidx.compose.ui:ui-tooling-preview:1.4.3" + implementation "androidx.compose.runtime:runtime-livedata:1.4.3" implementation "androidx.navigation:navigation-compose:2.5.3" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' implementation "com.google.dagger:hilt-android:2.44" - androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3" - debugImplementation "androidx.compose.ui:ui-tooling:1.3.3" - debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3" + androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3" + debugImplementation "androidx.compose.ui:ui-tooling:1.4.3" + debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.3" kapt "com.google.dagger:hilt-compiler:2.44" - implementation "androidx.room:room-runtime:2.5.0" - annotationProcessor "androidx.room:room-compiler:2.5.0" - kapt "androidx.room:room-compiler:2.5.0" - implementation "androidx.room:room-ktx:2.5.0" + implementation "androidx.room:room-runtime:2.5.1" + annotationProcessor "androidx.room:room-compiler:2.5.1" + kapt "androidx.room:room-compiler:2.5.1" + implementation "androidx.room:room-ktx:2.5.1" implementation "androidx.multidex:multidex:2.0.1" api "androidx.navigation:navigation-fragment-ktx:2.5.3" } diff --git a/build.gradle b/build.gradle index 5f2692d..d85e04d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext { - compose_version = '1.1.1' - } - ext.kotlin_version = "1.7.20" + ext.kotlin_version = "1.8.21" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 30dbeb4..834a004 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,7 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=false # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=true +android.nonFinalResIds=false \ No newline at end of file