Split libs.versions.toml into module specific files

.github/workflows/code-quality.yml

@@ -41,39 +41,33 @@ jobs:
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
             **/anystream-data-models/**/*.kt
             **/anystream-data-models/**/*.kts
       - name: Get changed files
         id: client-ui
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
             **/anystream-client-ui/**/*.kt
             **/anystream-client-ui/**/*.kts
       - name: Get changed files
         id: server
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
             **/anystream-server/**/*.kt
             **/anystream-server/**/*.kts
       - name: Get changed files
         id: ios
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
-            **/anystream-client-ios/**/*.kt
-            **/anystream-client-ios/**/*.kts
+            **/anystream-client-ios/**
       - name: Get changed files
         id: web
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
             **/anystream-client-web/**/*.kt
             **/anystream-client-web/**/*.kts
 

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
           files: |
             .github/workflows/release.yml
             build.gradle.kts
-            gradle/libs.versions.toml
+            gradle/*.versions.toml
             gradle/kotlin-js-store/**
             **/anystream-client-web/**
             **/anystream-client-ui/**

.github/workflows/tests.yml

@@ -31,7 +31,9 @@ jobs:
         with:
           files: |
             build.gradle.kts
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsClient.versions.toml
+            gradle/libsAndroid.versions.toml
             **/anystream-client-android/**
             **/anystream-client-core/src/commonMain/**
             **/anystream-client-core/src/commonTest/**
@@ -42,37 +44,42 @@ jobs:
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsClient.versions.toml
             **/anystream-client-core/**
             **/anystream-data-models/**
       - name: Get changed files
         id: client-ui
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsClient.versions.toml
+            gradle/libsAndroid.versions.toml
             **/anystream-client-ui/**
       - name: Get changed files
         id: data-models
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
             **/anystream-data-models/**
       - name: Get changed files
         id: server
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsServer.versions.toml
             **/anystream-data-models/**
             **/anystream-server/**
       - name: Get changed files
         id: ios
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsClient.versions.toml
             **/anystream-client-ios/**
             **/anystream-client-core/src/commonMain/**
             **/anystream-client-core/src/commonTest/**
@@ -83,7 +90,8 @@ jobs:
         uses: tj-actions/changed-files@v37
         with:
           files: |
-            gradle/libs.versions.toml
+            gradle/libsCommon.versions.toml
+            gradle/libsClient.versions.toml
             gradle/kotlin-js-store/**
             **/anystream-client-web/**
             **/anystream-client-core/src/commonMain/**

anystream-client-android/build.gradle.kts

@@ -14,7 +14,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion = libsAndroid.versions.composeCompiler.get()
     }
     packaging {
         resources.excludes.add("META-INF/versions/*/*.bin")
@@ -54,28 +54,28 @@ android {
 dependencies {
     implementation(projects.anystreamClientCore)
     implementation(projects.anystreamClientUi)
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat.core)
-    implementation(libs.androidx.leanback.core)
-    implementation(libs.androidx.activity.ktx)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.bundles.compose)
-    implementation(libs.coil)
-    implementation(libs.bundles.exoplayer)
-    implementation(libs.zxing.core)
-    implementation(libs.quickie.bundled)
-    implementation(libs.okhttp)
-    implementation(libs.ktor.client.cio)
-    implementation(libs.koin.core)
-    implementation(libs.koin.android)
-    implementation(libs.koin.android.compat)
-    implementation(libs.koin.androidx.compose)
+    implementation(libsAndroid.androidx.core.ktx)
+    implementation(libsAndroid.androidx.appcompat.core)
+    implementation(libsAndroid.androidx.leanback.core)
+    implementation(libsAndroid.androidx.activity.ktx)
+    implementation(libsAndroid.androidx.activity.compose)
+    implementation(libsAndroid.androidx.lifecycle.viewmodel.compose)
+    implementation(libsAndroid.bundles.compose)
+    implementation(libsAndroid.coil)
+    implementation(libsAndroid.bundles.exoplayer)
+    implementation(libsAndroid.zxing.core)
+    implementation(libsAndroid.quickie.bundled)
+    implementation(libsClient.okhttp)
+    implementation(libsCommon.ktor.client.cio)
+    implementation(libsCommon.koin.core)
+    implementation(libsAndroid.koin.android)
+    implementation(libsAndroid.koin.android.compat)
+    implementation(libsAndroid.koin.androidx.compose)
 
-    debugImplementation(libs.anrWatchdog)
-    debugImplementation(libs.leakcanary)
+    debugImplementation(libsAndroid.anrWatchdog)
+    debugImplementation(libsAndroid.leakcanary)
 
-    androidTestImplementation(libs.coroutines.test) {
+    androidTestImplementation(libsCommon.coroutines.test) {
         // conflicts with mockito due to direct inclusion of byte buddy
         exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-debug")
     }

anystream-client-core/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 apply(plugin = "kotlinx-atomicfu")
 
 dependencies {
-    add("kspCommonMainMetadata", libs.mobiuskt.updateGenerator)
+    add("kspCommonMainMetadata", libsClient.mobiuskt.updateGenerator)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
@@ -30,65 +30,63 @@ kotlin {
             kotlin.srcDir("build/generated/ksp/metadata/$name/kotlin")
             dependencies {
                 api(projects.anystreamDataModels)
-                implementation(libs.atomicfu)
-                implementation(libs.coroutines.core)
-                implementation(libs.serialization.core)
-                implementation(libs.serialization.json)
+                implementation(libsCommon.atomicfu)
+                implementation(libsCommon.coroutines.core)
+                implementation(libsCommon.serialization.core)
+                implementation(libsCommon.serialization.json)
 
-                implementation(libs.ktor.client.core)
-                implementation(libs.ktor.client.contentNegotiation)
-                implementation(libs.ktor.client.websockets)
-                implementation(libs.ktor.serialization)
-                implementation(libs.ktor.client.logging)
+                implementation(libsCommon.ktor.client.core)
+                implementation(libsCommon.ktor.client.contentNegotiation)
+                implementation(libsCommon.ktor.client.websockets)
+                implementation(libsCommon.ktor.serialization)
+                implementation(libsCommon.ktor.client.logging)
 
-                api(libs.koin.core)
-                api(libs.objectstore.core)
-                api(libs.objectstore.json)
-                api(libs.coroutines.core)
-                api(libs.mobiuskt.core)
-                api(libs.mobiuskt.extras)
-                api(libs.mobiuskt.coroutines)
-                implementation(libs.mobiuskt.updateGenerator.api)
+                api(libsCommon.koin.core)
+                api(libsClient.objectstore.core)
+                api(libsClient.objectstore.json)
+                api(libsCommon.coroutines.core)
+                api(libsClient.mobiuskt.core)
+                api(libsClient.mobiuskt.extras)
+                api(libsClient.mobiuskt.coroutines)
+                implementation(libsClient.mobiuskt.updateGenerator.api)
 
-                api(libs.ktor.client.core)
-                api(libs.ktor.client.websockets)
-                implementation(libs.ktor.serialization)
+                api(libsCommon.ktor.client.core)
+                api(libsCommon.ktor.client.websockets)
+                implementation(libsCommon.ktor.serialization)
             }
         }
         val commonTest by getting {
             dependencies {
-                implementation(libs.mobiuskt.test)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(libsClient.mobiuskt.test)
             }
         }
 
         if (hasAndroidSdk) {
             val androidMain by getting {
                 dependencies {
-                    implementation(libs.ktor.client.cio)
-                    implementation(libs.objectstore.secure)
+                    implementation(libsCommon.ktor.client.cio)
+                    implementation(libsClient.objectstore.secure)
                 }
             }
         }
 
         val jsMain by getting {
             dependencies {
-                implementation(libs.ktor.client.js)
+                implementation(libsCommon.ktor.client.js)
             }
         }
 
         val iosMain by getting {
             dependencies {
-                implementation(libs.ktor.client.darwin)
-                implementation(libs.objectstore.secure)
+                implementation(libsCommon.ktor.client.darwin)
+                implementation(libsClient.objectstore.secure)
             }
         }
 
         val jvmMain by getting  {
             dependencies {
-                implementation(libs.objectstore.fs)
-                implementation(libs.ktor.client.cio)
+                implementation(libsClient.objectstore.fs)
+                implementation(libsCommon.ktor.client.cio)
             }
         }
     }

anystream-client-desktop/build.gradle.kts

@@ -16,7 +16,7 @@ kotlin {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(projects.anystreamClientUi)
-                implementation(libs.jna)
+                implementation(libsClient.jna)
             }
         }
     }
@@ -48,7 +48,7 @@ tasks {
         src(
             buildString {
                 append("https://github.com/DrewCarlson/libvlc-bin/releases/download/")
-                append(libs.versions.vlc.get())
+                append(libsClient.versions.vlc.get())
                 append('/')
                 append(getLibvlcForHost().orEmpty())
                 append(".zip")
@@ -69,7 +69,7 @@ tasks {
 }
 
 compose {
-    kotlinCompilerPlugin.set(libs.jbcompose.compiler.get().toString())
+    kotlinCompilerPlugin.set(libsClient.jbcompose.compiler.get().toString())
     desktop {
         application {
             mainClass = "MainKt"
@@ -90,7 +90,7 @@ compose {
 
                 appResourcesRootDir.set(project.layout.projectDirectory.dir("resources"))
 
-                val iconsRoot = project.file("../anystream-client-ui/src/commonMain/resources/images")
+                val iconsRoot = rootProject.file("anystream-client-ui/src/commonMain/resources/images")
                 macOS {
                     iconFile.set(iconsRoot.resolve("as_icon.icns"))
                 }

anystream-client-ui/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 compose {
-    kotlinCompilerPlugin.set(libs.jbcompose.compiler.get().toString())
+    kotlinCompilerPlugin.set(libsClient.jbcompose.compiler.get().toString())
     /*android {
         useAndroidX = true
     }*/
@@ -33,8 +33,6 @@ kotlin {
                 baseName = "AnyStreamCore"
                 export(projects.anystreamClientCore)
                 export(projects.anystreamDataModels)
-                export(libs.mobiuskt.core)
-                export(libs.mobiuskt.coroutines)
                 freeCompilerArgs += listOf(
                     "-linker-option", "-framework", "-linker-option", "Metal",
                     "-linker-option", "-framework", "-linker-option", "CoreText",
@@ -55,11 +53,11 @@ kotlin {
             dependencies {
                 api(projects.anystreamClientCore)
                 api(projects.anystreamDataModels)
-                api(libs.mobiuskt.core)
-                api(libs.mobiuskt.coroutines)
+                api(libsClient.mobiuskt.core)
+                api(libsClient.mobiuskt.coroutines)
 
-                implementation(libs.kamel.image)
-                implementation(libs.koin.compose)
+                implementation(libsClient.kamel.image)
+                implementation(libsClient.koin.compose)
                 implementation(compose.runtime)
                 implementation(compose.foundation)
                 implementation(compose.material)
@@ -73,19 +71,19 @@ kotlin {
             val androidMain by getting {
                 dependsOn(commonMain)
                 dependencies {
-                    implementation(libs.compose.ui.tooling)
-                    implementation(libs.compose.ui.tooling.preview)
-                    implementation(libs.bundles.media3)
-                    implementation(libs.androidx.activity.ktx)
-                    implementation(libs.androidx.activity.compose)
+                    implementation(libsAndroid.compose.ui.tooling)
+                    implementation(libsAndroid.compose.ui.tooling.preview)
+                    implementation(libsAndroid.bundles.media3)
+                    implementation(libsAndroid.androidx.activity.ktx)
+                    implementation(libsAndroid.androidx.activity.compose)
                 }
             }
         }
 
         val jvmMain by getting {
             dependencies {
                 implementation(compose.desktop.common)
-                implementation(libs.vlcj)
+                implementation(libsClient.vlcj)
             }
         }