From 959cb04640e90c35fe424d30f45867ac6626981b Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 12 Jun 2023 12:50:10 +0200 Subject: Update build files/dependencies --- build.gradle.kts | 6 ++---- gradle.properties | 1 - main/build.gradle.kts | 18 +++++++++--------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6cebeb78..db31fcb1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,16 +6,14 @@ buildscript { var kotlin_version: String by extra - var fragment_version: String by extra - kotlin_version = "1.7.22" - fragment_version = "1.5.5" + kotlin_version = "1.8.20" repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.0.1") + classpath("com.android.tools.build:gradle:8.0.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } diff --git a/gradle.properties b/gradle.properties index 2af7a640..766a0917 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,6 @@ # Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt # -android.enableJetifier=true android.useAndroidX=true android.enableUnitTestBinaryResources=false android.defaults.buildfeatures.buildconfig=true diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 49b20885..5774b303 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -204,12 +204,12 @@ dependencies { // https://maven.google.com/web/index.html // https://developer.android.com/jetpack/androidx/releases/core val preferenceVersion = "1.2.0" - val coreVersion = "1.9.0" + val coreVersion = "1.10.1" val materialVersion = "1.7.0" - val fragment_version = "1.5.5" + val fragment_version = "1.6.0" - implementation("androidx.annotation:annotation:1.3.0") + implementation("androidx.annotation:annotation:1.6.0") implementation("androidx.core:core:$coreVersion") @@ -217,19 +217,19 @@ dependencies { dependencies.add("uiImplementation", "androidx.constraintlayout:constraintlayout:2.1.4") dependencies.add("uiImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22") dependencies.add("uiImplementation", "androidx.cardview:cardview:1.0.0") - dependencies.add("uiImplementation", "androidx.recyclerview:recyclerview:1.2.1") - dependencies.add("uiImplementation", "androidx.appcompat:appcompat:1.5.1") + dependencies.add("uiImplementation", "androidx.recyclerview:recyclerview:1.3.0") + dependencies.add("uiImplementation", "androidx.appcompat:appcompat:1.6.1") dependencies.add("uiImplementation", "com.github.PhilJay:MPAndroidChart:v3.1.0") - dependencies.add("uiImplementation", "com.squareup.okhttp3:okhttp:4.9.3") + dependencies.add("uiImplementation", "com.squareup.okhttp3:okhttp:4.10.0") dependencies.add("uiImplementation", "androidx.core:core:$coreVersion") dependencies.add("uiImplementation", "androidx.core:core-ktx:$coreVersion") dependencies.add("uiImplementation", "androidx.fragment:fragment-ktx:$fragment_version") dependencies.add("uiImplementation", "androidx.preference:preference:$preferenceVersion") dependencies.add("uiImplementation", "androidx.preference:preference-ktx:$preferenceVersion") dependencies.add("uiImplementation", "com.google.android.material:material:$materialVersion") - dependencies.add("uiImplementation", "androidx.webkit:webkit:1.4.0") - dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") - dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + dependencies.add("uiImplementation", "androidx.webkit:webkit:1.7.0") + dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") + dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") dependencies.add("uiImplementation","androidx.security:security-crypto:1.1.0-alpha06") -- cgit v1.2.3