Dependency updates

DrewCarlson · Nov 10, 2023 · ff86d4a · ff86d4a
1 parent ecf6ddf
commit ff86d4a
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .gradle/
+.fleet/
 /.idea
 !/.idea/codeStyles
 out/

diff --git a/anystream-client-android/build.gradle.kts b/anystream-client-android/build.gradle.kts
@@ -61,7 +61,9 @@ dependencies {
     implementation(libsAndroid.androidx.activity.compose)
     implementation(libsAndroid.androidx.lifecycle.viewmodel.compose)
     implementation(libsAndroid.bundles.compose)
-    implementation(libsAndroid.coil)
+    implementation(libsClient.compose.foundation)
+    implementation(libsClient.compose.material)
+    implementation(libsClient.coil)
     implementation(libsAndroid.bundles.exoplayer)
     implementation(libsAndroid.zxing.core)
     implementation(libsAndroid.quickie.bundled)

diff --git a/anystream-client-ui/build.gradle.kts b/anystream-client-ui/build.gradle.kts
@@ -21,7 +21,7 @@ if (hasAndroidSdk) {
             compose = true
         }
         composeOptions {
-            kotlinCompilerExtensionVersion = "1.5.0"
+            kotlinCompilerExtensionVersion = libsAndroid.versions.composeCompiler.get()
         }
     }
 }

diff --git a/anystream-server/server-app/build.gradle.kts b/anystream-server/server-app/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("server-lib")
     alias(libsCommon.plugins.serialization)

diff --git a/anystream-server/server-db-models/build.gradle.kts b/anystream-server/server-db-models/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("server-lib")
     alias(libsCommon.plugins.ksp)

diff --git a/anystream-server/server-library-manager/build.gradle.kts b/anystream-server/server-library-manager/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("server-lib")
     alias(libsCommon.plugins.serialization)

diff --git a/build-logic/src/main/kotlin/multiplatform-lib.gradle.kts b/build-logic/src/main/kotlin/multiplatform-lib.gradle.kts
@@ -20,6 +20,9 @@ if (hasAndroidSdk) {
             sourceCompatibility = JAVA_TARGET
             targetCompatibility = JAVA_TARGET
         }
+        packaging {
+            resources.excludes.add("META-INF/versions/*/*.bin")
+        }
     }
 }
 
@@ -55,6 +58,7 @@ kotlin {
         iosSimulatorArm64()
         iosX64()
     }
+    applyDefaultHierarchyTemplate()
 
     @Suppress("UNUSED_VARIABLE")
     sourceSets {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 import org.jmailen.gradle.kotlinter.tasks.ConfigurableKtLintTask
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libsCommon.plugins.multiplatform) apply false
     alias(libsCommon.plugins.jvm) apply false

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.ignoreDisabledTargets=true
-kotlin.native.cacheKind=none
 kotlin.incremental.js.ir=true
 android.useAndroidX=true
 android.enableJetifier=false

diff --git a/gradle/libsAndroid.versions.toml b/gradle/libsAndroid.versions.toml
@@ -1,16 +1,14 @@
 [versions]
 zxing = "3.5.1"
 anr_watchdog = "1.4.0"
-compose = "1.5.0"
-compose_material = "1.5.0"
-compose_foundation = "1.5.0"
-composeCompiler = "1.5.0"
+compose = "1.5.4"
+composeCompiler = "1.5.4"
 exoplayer = "2.19.1"
 media3 = "1.1.1"
 ax_runner = "1.5.2"
 leakcanary = "2.12"
-koinAndroid = "3.4.3"
-koinAndroidxCompose = "3.4.6"
+koinAndroid = "3.5.0"
+koinAndroidxCompose = "3.5.0"
 
 okhttp = "5.0.0-alpha.11"
 
@@ -35,18 +33,15 @@ media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" }
 
 compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose_foundation" }
-compose-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose_material" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose_material" }
 compose-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.10.1" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.12.0" }
 androidx-appcompat-core = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
 androidx-leanback-core = { module = "androidx.leanback:leanback", version = "1.1.0-rc02" }
-androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.7.2" }
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.7.2" }
-androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.6.1" }
+androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.8.0" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.0" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.6.2" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "ax_runner" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" }
@@ -55,13 +50,11 @@ koin-android-workmanager = { module = "io.insert-koin:koin-android-navigation",
 koin-android-navigation = { module = "io.insert-koin:koin-android-navigation", version.ref = "koinAndroid" }
 koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinAndroidxCompose" }
 
-coil = { module = "io.coil-kt:coil-compose", version = "2.4.0" }
-
-quickie-bundled = { module = "io.github.g00fy2.quickie:quickie-bundled", version = "1.7.0" }
+quickie-bundled = { module = "io.github.g00fy2.quickie:quickie-bundled", version = "1.8.0" }
 
 leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
 
 [bundles]
 exoplayer = ["exoplayer-core", "exoplayer-ui", "exoplayer-hls"]
 media3 = ["media3-core", "media3-ui", "media3-hls", "media3-okhttp", "media3-cast", "media3-session"]
-compose = ["compose-ui-ui", "compose-ui-tooling", "compose-foundation", "compose-material", "compose-livedata"]
+compose = ["compose-ui-ui", "compose-ui-tooling", "compose-livedata"]
diff --git a/gradle/libsClient.versions.toml b/gradle/libsClient.versions.toml
@@ -2,17 +2,17 @@
 zxing = "3.5.1"
 anr_watchdog = "1.4.0"
 compose = "1.5.0"
-compose_material = "1.4.3"
-compose_foundation = "1.5.0"
+compose_material = "1.5.4"
+compose_foundation = "1.5.4"
 composejb = "1.5.0-rc01"
-composejb_compile = "1.5.0"
+composejb_compile = "1.5.3"
 exoplayer = "2.19.1"
 media3 = "1.1.1"
 ax_runner = "1.5.2"
 leakcanary = "2.12"
 koin = "3.4.3"
 koinKtor = "3.4.3"
-kamelImage = "0.7.0"
+kamelImage = "0.8.3"
 
 mobiuskt = "0.6.0"
 
@@ -24,8 +24,8 @@ vlc = "3.0.18"
 composejb = { id = "org.jetbrains.compose", version.ref = "composejb" }
 
 [libraries]
-kotlinjs-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version = "1.0.0-pre.619" }
-kotlinjs-extensions = { module = "org.jetbrains.kotlin-wrappers:kotlin-extensions", version = "1.0.1-pre.619" }
+kotlinjs-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version = "1.0.0-pre.640" }
+kotlinjs-extensions = { module = "org.jetbrains.kotlin-wrappers:kotlin-extensions", version = "1.0.1-pre.640" }
 
 anrWatchdog = { module = "com.github.anrwatchdog:anrwatchdog", version.ref = "anr_watchdog" }
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxing" }
@@ -51,20 +51,11 @@ compose-material = { module = "androidx.compose.material:material", version.ref
 compose-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.10.1" }
-androidx-appcompat-core = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
-androidx-leanback-core = { module = "androidx.leanback:leanback", version = "1.1.0-rc02" }
-androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.7.2" }
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.7.2" }
-androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.6.1" }
-androidx-test-runner = { module = "androidx.test:runner", version.ref = "ax_runner" }
-
-koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
-koin-compose = { module = "io.insert-koin:koin-compose", version = "1.0.4" }
+koin-compose = { module = "io.insert-koin:koin-compose", version = "1.1.0" }
 koin-ktor = { module = "io.insert-koin:koin-ktor", version.ref = "koinKtor" }
 koin-slf4j = { module = "io.insert-koin:koin-logger-slf4j", version.ref = "koinKtor" }
 
-coil = { module = "io.coil-kt:coil-compose", version = "2.4.0" }
+coil = { module = "io.coil-kt:coil-compose", version = "2.5.0" }
 kamel-image = { module = "media.kamel:kamel-image", version.ref = "kamelImage" }
 routingCompose = { module = "app.softwork:routing-compose", version = "0.2.12" }
 

diff --git a/gradle/libsCommon.versions.toml b/gradle/libsCommon.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-kotlin = { strictly = "1.9.0" }
+kotlin = { strictly = "1.9.20" }
 coroutines = "1.7.3"
-serialization = "1.5.1"
-ktorio = "2.3.3"
-ksp = "1.9.0-1.0.13"
+serialization = "1.6.0"
+ktorio = "2.3.6"
+ksp = "1.9.20-1.0.14"
 atomicfu = "0.22.0"
 kover = "0.7.3"
-datetime = "0.4.0"
+datetime = "0.4.1"
 spotless = "6.20.0"
 ktlint = "0.48.2"
 ktor_perm = "0.2.1"
-koin = "3.4.3"
-koinKtor = "3.4.3"
+koin = "3.5.0"
+koinKtor = "3.5.1"
 agp = "8.1.1"
 
 [plugins]
@@ -75,6 +75,5 @@ ktor-server-permissions = { module = "org.drewcarlson:ktor-permissions", version
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
-koin-compose = { module = "io.insert-koin:koin-compose", version = "1.0.4" }
 koin-ktor = { module = "io.insert-koin:koin-ktor", version.ref = "koinKtor" }
 koin-slf4j = { module = "io.insert-koin:koin-logger-slf4j", version.ref = "koinKtor" }
diff --git a/gradle/libsServer.versions.toml b/gradle/libsServer.versions.toml
@@ -1,20 +1,20 @@
 [versions]
 qbittorrent = "1.0.0-beta04"
-jdbi = "3.41.0"
-jdbc_sqlite = "3.42.0.0"
+jdbi = "3.41.3"
+jdbc_sqlite = "3.42.0.1"
 kjob = "0.6.0"
 bouncy_castle = "1.70"
-jaffree = "2022.06.03"
+jaffree = "2023.09.10"
 logback = "1.4.11"
 koinKtor = "3.4.3"
-icu4j = "73.2"
-mockk = "1.13.7"
+icu4j = "74.1"
+mockk = "1.13.8"
 
 [plugins]
 shadowjar = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 
 [libraries]
-flyway-core = { module = "org.flywaydb:flyway-core", version = "9.21.2" }
+flyway-core = { module = "org.flywaydb:flyway-core", version = "9.22.3" }
 fastObjectPool = { module = "cn.danielw:fast-object-pool", version = "2.2.1" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }