diff --git a/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt index 2e64d40a..d4659646 100644 --- a/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt +++ b/src/android/app/src/main/java/info/cemu/cemu/graphicpacks/GraphicPacksDownloader.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.executeAsync +import okhttp3.coroutines.executeAsync import org.json.JSONObject import java.io.File import java.io.IOException diff --git a/src/android/gradle/libs.versions.toml b/src/android/gradle/libs.versions.toml index 82e0c8f5..21b3fab7 100644 --- a/src/android/gradle/libs.versions.toml +++ b/src/android/gradle/libs.versions.toml @@ -1,18 +1,19 @@ [versions] -agp = "8.7.3" -appcompat = "1.7.0" -kotlin = "2.0.21" -androidx-core-ktx = "1.15.0" -androidx-activity-compose = "1.9.3" -androidx-compose-bom = "2024.11.00" +agp = "8.11.1" +aboutlibraries = "13.0.0-a01" +appcompat = "1.7.1" +kotlin = "2.2.0" +androidx-core-ktx = "1.16.0" +androidx-activity-compose = "1.10.1" +androidx-compose-bom = "2025.07.00" material = "1.12.0" -androidx-navigation-compose = "2.8.4" -okhttp = "4.12.0" -okhhtp-coroutines = "5.0.0-alpha.11" -kotlinx-serialization-json = "1.7.3" +androidx-navigation-compose = "2.9.2" +okhttp = "5.1.0" +kotlinx-serialization-json = "1.9.0" kotlinx-gettext = "0.7.0" [libraries] +aboutlibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlibraries" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation-compose" } @@ -25,11 +26,12 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } material = { module = "com.google.android.material:material", version.ref = "material" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } -okhttp-coroutines = { module = "com.squareup.okhttp3:okhttp-coroutines", version.ref = "okhhtp-coroutines" } +okhttp-coroutines = { module = "com.squareup.okhttp3:okhttp-coroutines", version.ref = "okhttp" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" } kotlinx-gettext = { module = "name.kropp.kotlinx-gettext:kotlinx-gettext", version.ref = "kotlinx-gettext" } [plugins] +aboutlibraries-android = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutlibraries" } android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties index aba81810..697a0b4d 100644 --- a/src/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jun 07 12:59:34 EEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists