From ebd4ee77e13e082d3d8688947df10cbe1d7cd64f Mon Sep 17 00:00:00 2001 From: Reg Tiangha Date: Wed, 22 May 2024 09:47:06 -0600 Subject: [PATCH] Android: Update various dependencies --- src/android/app/build.gradle.kts | 22 +++++++++---------- src/android/build.gradle.kts | 10 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 487c2e83b..649b9674f 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -8,9 +8,9 @@ import de.undercouch.gradle.tasks.download.Download plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("de.undercouch.download") version "5.5.0" + id("de.undercouch.download") version "5.6.0" id("kotlin-parcelize") - kotlin("plugin.serialization") version "1.9.22" + kotlin("plugin.serialization") version "2.0.0" id("androidx.navigation.safeargs.kotlin") } @@ -29,7 +29,7 @@ android { namespace = "io.github.lime3ds.android" compileSdkVersion = "android-34" - ndkVersion = "26.1.10909125" + ndkVersion = "26.3.11579264" compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -164,27 +164,27 @@ android { dependencies { implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("androidx.activity:activity-ktx:1.8.2") - implementation("androidx.fragment:fragment-ktx:1.6.2") + implementation("androidx.fragment:fragment-ktx:1.7.1") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.documentfile:documentfile:1.0.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0") implementation("androidx.slidingpanelayout:slidingpanelayout:1.2.0") - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.12.0") implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.work:work-runtime:2.9.0") implementation("org.ini4j:ini4j:0.5.4") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") - implementation("androidx.navigation:navigation-ui-ktx:2.7.6") + implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") + implementation("androidx.navigation:navigation-ui-ktx:2.7.7") implementation("info.debatty:java-string-similarity:2.0.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("io.coil-kt:coil:2.5.0") + implementation("io.coil-kt:coil:2.6.0") } // Download Vulkan Validation Layers from the KhronosGroup GitHub. val downloadVulkanValidationLayers = tasks.register("downloadVulkanValidationLayers") { - src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/sdk-1.3.261.1/android-binaries-sdk-1.3.261.1-android.zip") + src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.3.283.0/android-binaries-1.3.283.0.zip") dest(file("${buildDir}/tmp/Vulkan-ValidationLayers.zip")) onlyIfModified(true) } diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index 28975daf1..64cec9a03 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts @@ -4,10 +4,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.3.2" apply false - id("com.android.library") version "8.3.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.22" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" + id("com.android.application") version "8.4.0" apply false + id("com.android.library") version "8.4.0" apply false + id("org.jetbrains.kotlin.android") version "2.0.0" apply false + id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" } tasks.register("clean").configure { @@ -19,6 +19,6 @@ buildscript { google() } dependencies { - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.6") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7") } } diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties index 42b415f18..03ef85ab3 100644 --- a/src/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/android/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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip