From df332860b8fa1a4f873a7fa1d08c45e71cfb12ed Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 4 Oct 2023 22:28:50 -0400 Subject: [PATCH] Bump dependencies --- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 1 + gradle.properties | 3 +-- gradle/androidx.versions.toml | 2 +- gradle/compose.versions.toml | 2 +- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 1d67ab6683..7b07c85210 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -151,6 +151,7 @@ class MainActivity : BaseActivity() { } // Draw edge-to-edge + // TODO: replace with ComponentActivity#enableEdgeToEdge WindowCompat.setDecorFitsSystemWindows(window, false) setComposeContent { diff --git a/gradle.properties b/gradle.properties index 8102dd1763..282f16ede6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 android.useAndroidX=true android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -#android.nonFinalResIds=false \ No newline at end of file +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index ec3244800b..5c6aca3f96 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,5 +1,5 @@ [versions] -agp_version = "8.1.1" +agp_version = "8.1.2" lifecycle_version = "2.6.2" paging_version = "3.2.1" diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index dc18de7852..26f0809d06 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -4,7 +4,7 @@ compose-bom = "2023.09.00-alpha02" accompanist = "0.33.1-alpha" [libraries] -activity = "androidx.activity:activity-compose:1.7.2" +activity = "androidx.activity:activity-compose:1.8.0" bom = { group = "dev.chrisbanes.compose", name = "compose-bom", version.ref = "compose-bom" } foundation = { module = "androidx.compose.foundation:foundation" } animation = { module = "androidx.compose.animation:animation" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48ef5459fc..5530606380 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ flowreactivenetwork = "ru.beryukhov:flowreactivenetwork:1.0.4" okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp_version" } okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp_version" } okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp_version" } -okio = "com.squareup.okio:okio:3.5.0" +okio = "com.squareup.okio:okio:3.6.0" conscrypt-android = "org.conscrypt:conscrypt-android:2.5.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34e8a..3fa8f862f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME