Dependency updates

.editorconfig

@@ -1,6 +1,9 @@
 root = true
 
 [*.{kt,kts}]
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
-ktlint_standard_no-wildcard-imports = disabled
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ktlint_code_style = ktlint_official
+ktlint_standard = enabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable

.github/workflows/code-quality.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: code-quality-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -100,7 +100,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-client-ui spotlessCheck lintKotlin
+          arguments: -p anystream-client-ui spotlessCheck
 
   client-android:
     runs-on: ubuntu-latest
@@ -127,7 +127,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-client-android spotlessCheck lintKotlin
+          arguments: -p anystream-client-android spotlessCheck
 
   client-core:
     runs-on: ubuntu-latest
@@ -154,7 +154,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-client-core spotlessCheck lintKotlin
+          arguments: -p anystream-client-core spotlessCheck
 
   client-web:
     runs-on: ubuntu-latest
@@ -181,7 +181,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-client-web spotlessCheck lintKotlin
+          arguments: -p anystream-client-web spotlessCheck
 
   data-models:
     runs-on: ubuntu-latest
@@ -208,7 +208,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-data-models spotlessCheck lintKotlin
+          arguments: -p anystream-data-models spotlessCheck
 
   server:
     runs-on: ubuntu-latest
@@ -235,4 +235,4 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         name: Spotless Check
         with:
-          arguments: -p anystream-server spotlessCheck lintKotlin
+          arguments: -p anystream-server spotlessCheck

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
       - 'v*'
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: release-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 env:

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: tests-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 env:

.github/workflows/yarn-lock-upgrade.yml

@@ -6,7 +6,7 @@ on:
       - 'renovate/**'
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: yarn-upgrade-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

.gitignore

@@ -1,4 +1,5 @@
 .gradle/
+.fleet/
 /.idea
 !/.idea/codeStyles
 out/

anystream-client-android/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    alias(libsCommon.plugins.spotless)
 }
 
 android {
@@ -61,7 +62,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)
@@ -80,3 +83,14 @@ dependencies {
         exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-debug")
     }
 }
+
+afterEvaluate {
+    spotless {
+        kotlin {
+            target("**/**.kt")
+            licenseHeaderFile(rootDir.resolve("licenseHeader.txt"))
+            //ktlint(libsCommon.versions.ktlint.get())
+            //    .setEditorConfigPath(rootDir.resolve(".editorconfig"))
+        }
+    }
+}

anystream-client-android/src/main/kotlin/router/BackStack.kt

@@ -53,7 +53,8 @@ class BackStack<T> internal constructor(
         } else {
             onElementRemoved.invoke(lastIndex)
             elements = ArrayList(
-                elements.subList(0, lastIndex), // exclusive
+                // exclusive
+                elements.subList(0, lastIndex),
             )
             true
         }

anystream-client-android/src/main/kotlin/ui/PairingScanner.kt

@@ -52,7 +52,7 @@ fun PairingScanner(
             if (result is QRResult.QRSuccess) {
                 val user = client.user.filterNotNull().first()
                 try {
-                    client.login(user.username, result.content.rawValue, pairing = true)
+                    client.login(user.username, result.content.rawValue.orEmpty(), pairing = true)
                 } catch (e: ClientRequestException) {
                     e.printStackTrace()
                 }

anystream-client-core/build.gradle.kts

@@ -10,24 +10,9 @@ dependencies {
     add("kspCommonMainMetadata", libsClient.mobiuskt.updateGenerator)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
-    if (name != "kspCommonMainKotlinMetadata") {
-        dependsOn("kspCommonMainKotlinMetadata")
-    }
-}
-
-tasks.findByName("lintKotlinCommonMain")?.apply {
-    dependsOn("kspCommonMainKotlinMetadata")
-}
-
-tasks.findByName("formatKotlinCommonMain")?.apply {
-    dependsOn("kspCommonMainKotlinMetadata")
-}
-
 kotlin {
     sourceSets {
         val commonMain by getting {
-            kotlin.srcDir("build/generated/ksp/metadata/$name/kotlin")
             dependencies {
                 api(projects.anystreamDataModels)
                 implementation(libsCommon.atomicfu)

anystream-client-core/src/commonMain/kotlin/anystream/client/AnyStreamClient.kt

@@ -83,19 +83,19 @@ class AnyStreamClient(
     val token: String?
         get() = sessionManager.fetchToken()
 
-    private val _serverUrl = atomic("")
-    private val _serverUrlWss = atomic("")
+    private val serverUrlInternal = atomic("")
+    private val serverUrlWssInternal = atomic("")
     var serverUrl: String
-        get() = _serverUrl.value
+        get() = serverUrlInternal.value
         private set(value) {
             val trimmedUrl = value.trimEnd('/')
-            _serverUrl.value = trimmedUrl
-            _serverUrlWss.value = trimmedUrl
+            serverUrlInternal.value = trimmedUrl
+            serverUrlWssInternal.value = trimmedUrl
                 .replace("https://", "wss://", ignoreCase = true)
                 .replace("http://", "ws://", ignoreCase = true)
         }
     private val serverUrlWs: String
-        get() = _serverUrlWss.value
+        get() = serverUrlWssInternal.value
 
     init {
         this.serverUrl = serverUrl ?: sessionManager.fetchServerUrl() ?: ""

anystream-client-ui/build.gradle.kts

@@ -21,7 +21,7 @@ if (hasAndroidSdk) {
             compose = true
         }
         composeOptions {
-            kotlinCompilerExtensionVersion = "1.5.0"
+            kotlinCompilerExtensionVersion = libsAndroid.versions.composeCompiler.get()
         }
     }
 }

anystream-client-ui/src/commonMain/kotlin/anystream/router/BackStack.kt

@@ -53,7 +53,8 @@ class BackStack<T> internal constructor(
         } else {
             onElementRemoved.invoke(lastIndex)
             elements = ArrayList(
-                elements.subList(0, lastIndex), // exclusive
+                // exclusive
+                elements.subList(0, lastIndex),
             )
             true
         }

anystream-data-models/src/IsoLanguageCodes.kt

@@ -27,15 +27,18 @@ internal data class LangCode(
 
 internal object IsoLanguageCodes {
 
+    @Suppress("ktlint:standard:function-naming")
     fun by639_2(code: String): LangCode? {
         val lowercaseCode = code.lowercase()
         return by639_2T[lowercaseCode] ?: by639_2B[lowercaseCode]
     }
 
+    @Suppress("ktlint:standard:function-naming")
     fun by639_2T(code: String): LangCode? {
         return by639_2T[code.lowercase()]
     }
 
+    @Suppress("ktlint:standard:function-naming")
     fun by639_2B(code: String): LangCode? {
         return by639_2B[code.lowercase()]
     }

anystream-data-models/src/PlaybackState.kt

@@ -24,10 +24,13 @@ import kotlinx.serialization.Serializable
 data class PlaybackState(
     val id: String,
     val mediaLinkGid: String,
-    val metadataGid: String, // TODO: Make optional
+    // TODO: Make optional
+    val metadataGid: String,
     val userId: Int,
-    val position: Double, // TODO: Use Duration
-    val runtime: Double, // TODO: Use Duration
+    // TODO: Use Duration
+    val position: Double,
+    // TODO: Use Duration
+    val runtime: Double,
     val updatedAt: Instant,
 ) {
     val completedPercent: Float

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)

anystream-server/server-db-models/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("server-lib")
     alias(libsCommon.plugins.ksp)
@@ -30,11 +29,3 @@ dependencies {
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit"))
 }
-
-tasks.named("formatKotlinMain").configure {
-    dependsOn("kspKotlin")
-}
-
-tasks.named("lintKotlinMain").configure {
-    dependsOn("kspKotlin")
-}

anystream-server/server-library-manager/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("server-lib")
     alias(libsCommon.plugins.serialization)

build-logic/build.gradle.kts

@@ -6,6 +6,7 @@ dependencies {
     implementation(libsCommon.agp)
     implementation(libsCommon.kotlin.gradle.plugin)
     implementation(libsCommon.ksp)
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:${libsCommon.versions.spotless.get()}")
     implementation("org.gradle.kotlin:gradle-kotlin-dsl-conventions:0.8.0")
 }
 

build-logic/src/main/kotlin/IosBuildUtils.kt

@@ -1,27 +1,4 @@
-import org.gradle.kotlin.dsl.creating
-import org.gradle.kotlin.dsl.getValue
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 fun KotlinMultiplatformExtension.configureCommonIosSourceSets() {
-    val iosMain by sourceSets.creating {
-        dependsOn(sourceSets.getByName("commonMain"))
-    }
-
-    val iosTest by sourceSets.creating {
-        dependsOn(sourceSets.getByName("commonTest"))
-    }
-
-    sourceSets.filter { sourceSet ->
-        sourceSet.name.run {
-            startsWith("iosX64") ||
-                    startsWith("iosArm") ||
-                    startsWith("iosSimulator")
-        }
-    }.forEach { sourceSet ->
-        if (sourceSet.name.endsWith("Main")) {
-            sourceSet.dependsOn(iosMain)
-        } else {
-            sourceSet.dependsOn(iosTest)
-        }
-    }
 }

build-logic/src/main/kotlin/multiplatform-lib.gradle.kts

@@ -3,6 +3,7 @@ import org.gradle.kotlin.dsl.*
 
 plugins {
     kotlin("multiplatform")
+    id("com.diffplug.spotless")
 }
 
 apply(plugin = "kotlinx-atomicfu")
@@ -20,6 +21,21 @@ if (hasAndroidSdk) {
             sourceCompatibility = JAVA_TARGET
             targetCompatibility = JAVA_TARGET
         }
+        packaging {
+            resources.excludes.add("META-INF/versions/*/*.bin")
+        }
+    }
+}
+
+afterEvaluate {
+    spotless {
+        kotlin {
+            target("**/**.kt")
+            licenseHeaderFile(rootDir.resolve("licenseHeader.txt"))
+            val libsCommon = extensions.getByType<VersionCatalogsExtension>().named("libsCommon")
+            //ktlint(libsCommon.findVersion("ktlint").get().requiredVersion)
+            //    .setEditorConfigPath(rootDir.resolve(".editorconfig"))
+        }
     }
 }
 
@@ -55,6 +71,15 @@ kotlin {
         iosSimulatorArm64()
         iosX64()
     }
+    applyDefaultHierarchyTemplate()
+
+    targets.all {
+        compilations.configureEach {
+            compilerOptions.configure {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
 
     @Suppress("UNUSED_VARIABLE")
     sourceSets {
@@ -135,10 +160,12 @@ kotlin {
     }
 }
 
-if (tasks.any { it.name == "kspCommonMainKotlinMetadata" }) {
-    tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
-        if (name != "kspCommonMainKotlinMetadata") {
-            dependsOn("kspCommonMainKotlinMetadata")
+afterEvaluate {
+    if (extensions.findByName("ksp") != null) {
+        tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
+            if (name != "kspCommonMainKotlinMetadata") {
+                dependsOn("kspCommonMainKotlinMetadata")
+            }
         }
     }
 }