From 93f51b9220b9634801593bd93f22d61ab9c30a3d Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 31 May 2024 14:55:38 +0200 Subject: [PATCH] Update dependencies. --- .gitignore | 1 + app/build.gradle | 59 ++++++++++++------------ build.gradle | 7 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 5f99499..b312ce7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ .idea keystore.properties version.properties +.vscode/ diff --git a/app/build.gradle b/app/build.gradle index a636bc3..ecb1c2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ plugins { id 'kotlin-android' id 'com.google.dagger.hilt.android' id 'kotlin-kapt' + id 'com.google.devtools.ksp' } // Create a variable called keystorePropertiesFile, and initialize it to your @@ -67,7 +68,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.8" + kotlinCompilerExtensionVersion = "1.5.14" } compileOptions { @@ -88,44 +89,44 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation "androidx.compose.material3:material3:1.1.1" + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation "androidx.compose.material3:material3:1.2.1" implementation 'com.google.android.play:core-ktx:1.8.1' implementation 'com.google.android.play:core-ktx:1.8.1' - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.7.1' - implementation 'androidx.navigation:navigation-ui-ktx:2.7.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' - implementation 'androidx.fragment:fragment-ktx:1.6.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1' + implementation 'androidx.fragment:fragment-ktx:1.7.1' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.recyclerview:recyclerview:1.3.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.compose.material:material-icons-extended:1.5.0' + implementation 'androidx.recyclerview:recyclerview:1.3.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1' + implementation 'androidx.compose.material:material-icons-extended:1.6.7' implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0" - implementation 'androidx.activity:activity-compose:1.7.2' - implementation "androidx.compose.ui:ui:1.5.0" - implementation "androidx.compose.ui:ui-tooling-preview:1.5.0" - implementation "androidx.compose.runtime:runtime-livedata:1.5.0" - implementation "androidx.navigation:navigation-compose:2.7.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" + implementation 'androidx.activity:activity-compose:1.9.0' + implementation "androidx.compose.ui:ui:1.6.7" + implementation "androidx.compose.ui:ui-tooling-preview:1.6.7" + implementation "androidx.compose.runtime:runtime-livedata:1.6.7" + implementation "androidx.navigation:navigation-compose:2.7.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.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.5.0" - debugImplementation "androidx.compose.ui:ui-tooling:1.5.0" - debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.0" - kapt "com.google.dagger:hilt-compiler:2.44" - implementation "androidx.room:room-runtime:2.5.2" - annotationProcessor "androidx.room:room-compiler:2.5.2" - kapt "androidx.room:room-compiler:2.5.2" - implementation "androidx.room:room-ktx:2.5.2" + implementation "com.google.dagger:hilt-android:2.51.1" + androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.7" + debugImplementation "androidx.compose.ui:ui-tooling:1.6.7" + debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.7" + kapt "com.google.dagger:hilt-compiler:2.51.1" + implementation "androidx.room:room-runtime:2.6.1" + annotationProcessor "androidx.room:room-compiler:2.6.1" + ksp "androidx.room:room-compiler:2.6.1" + implementation "androidx.room:room-ktx:2.6.1" implementation "androidx.multidex:multidex:2.0.1" - api "androidx.navigation:navigation-fragment-ktx:2.7.1" + api "androidx.navigation:navigation-fragment-ktx:2.7.7" } // Allow references to generated code diff --git a/build.gradle b/build.gradle index 93c98d9..4b8563e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.8.22" + ext.kotlin_version = "1.9.24" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -15,8 +15,9 @@ buildscript { } plugins { - id 'com.google.dagger.hilt.android' version '2.44' apply false + id 'com.google.dagger.hilt.android' version '2.51.1' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.devtools.ksp' version '1.9.24-1.0.20' apply false } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4f7780d..15f6fd3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip