Removing deprecated library addresses and deprecated apis

commons/build.gradle.kts

@@ -49,12 +49,12 @@ kotlin {
                 implementation(project(":quartz"))
 
                 // Compose Multiplatform
-                implementation(compose.ui)
-                implementation(compose.foundation)
-                implementation(compose.runtime)
-                implementation(compose.material3)
-                implementation(compose.materialIconsExtended)
-                implementation(compose.components.uiToolingPreview)
+                implementation(libs.jetbrains.compose.ui)
+                implementation(libs.jetbrains.compose.foundation)
+                implementation(libs.jetbrains.compose.runtime)
+                implementation(libs.jetbrains.compose.material3)
+                implementation(libs.jetbrains.compose.material.icons.extended)
+                implementation(libs.jetbrains.compose.ui.tooling.preview)
 
                 // Lifecycle ViewModel (KMP since 2.8.0)
                 implementation(libs.androidx.lifecycle.viewmodel.compose)
@@ -71,7 +71,7 @@ kotlin {
                 api(libs.kotlinx.collections.immutable)
 
                 // Compose Multiplatform Resources
-                implementation(compose.components.resources)
+                implementation(libs.jetbrains.compose.components.resources)
             }
         }
 
@@ -94,7 +94,7 @@ kotlin {
             dependencies {
                 // Desktop-specific Compose
                 implementation(compose.desktop.currentOs)
-                implementation(compose.uiTooling)
+                implementation(libs.jetbrains.compose.ui.tooling)
 
                 // Secure key storage via OS keychain (macOS/Windows/Linux)
                 implementation(libs.java.keyring)

desktopApp/build.gradle.kts

@@ -23,9 +23,9 @@ kotlin {
 
 dependencies {
     implementation(compose.desktop.currentOs)
-    implementation(compose.material3)
-    implementation(compose.materialIconsExtended)
-    implementation(compose.components.resources)
+    implementation(libs.jetbrains.compose.material3)
+    implementation(libs.jetbrains.compose.material.icons.extended)
+    implementation(libs.jetbrains.compose.components.resources)
 
     // Quartz Nostr library (will use JVM target)
     implementation(project(":quartz"))

gradle/libs.versions.toml

@@ -39,6 +39,8 @@ lazysodiumJava = "5.2.0"
 lifecycleRuntimeKtx = "2.10.0"
 lightcompressor-enhanced = "1.6.0"
 markdown = "f92ef49c9d"
+material3 = "1.9.0"
+materialIconsExtended = "1.7.3"
 media3 = "1.9.2"
 mockk = "1.14.9"
 kotlinx-coroutines-test = "1.10.2"
@@ -53,6 +55,7 @@ spotless = "8.3.0"
 tarsosdsp = "2.5"
 torAndroid = "0.4.9.5"
 translate = "17.0.3"
+jetbrainsCompose = "1.10.2"
 unifiedpush = "3.0.10"
 vico-charts = "2.4.3"
 zelory = "3.0.1"
@@ -122,6 +125,14 @@ dev-whyoleg-cryptography-provider-apple-optimal = { module = "dev.whyoleg.crypto
 drfonfon-geohash = { group = "com.github.drfonfon", name = "android-kotlin-geohash", version.ref = "androidKotlinGeohash" }
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
 firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" }
+jetbrains-compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "jetbrainsCompose" }
+jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "jetbrainsCompose" }
+jetbrains-compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
+jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
+jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jetbrainsCompose" }
 google-mlkit-language-id = { group = "com.google.mlkit", name = "language-id", version.ref = "languageId" }
 google-mlkit-translate = { group = "com.google.mlkit", name = "translate", version.ref = "translate" }
 jackson-module-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }

quartz/build.gradle.kts

@@ -1,11 +1,13 @@
 @file:OptIn(ExperimentalSpmForKmpFeature::class)
 
 import com.vanniktech.maven.publish.KotlinMultiplatform
+import com.vanniktech.maven.publish.SourcesJar
 import io.github.frankois944.spmForKmp.swiftPackageConfig
 import io.github.frankois944.spmForKmp.utils.ExperimentalSpmForKmpFeature
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidKotlinMultiplatformLibrary)
@@ -66,17 +68,18 @@ kotlin {
     val libsodiumDefFile = project.file("src/nativeInterop/cinterop/Clibsodium.def")
 
     // This generates the Libsodium definition file, necessary for creating native bindings(a Kotlin API) for libsodium(for iOS).
-    val libsodiumDefFileGeneration = tasks.register("GenerateSodiumCinteropFile") {
-        outputs.file(libsodiumDefFile)
-        doLast {
-            if (!libsodiumDefFile.exists()) {
-                libsodiumDefFile.parentFile.mkdirs()
-                libsodiumDefFile.writeText("package = Clibsodium\n")
-                libsodiumDefFile.appendText("staticLibraries = libsodium.a libsodium-simulator.a\n")
-                libsodiumDefFile.appendText("libraryPaths = ${libsodiumPath.absolutePath}/ios/lib ${libsodiumPath.absolutePath}/ios-simulators/lib\n")
+    val libsodiumDefFileGeneration =
+        tasks.register("GenerateSodiumCinteropFile") {
+            outputs.file(libsodiumDefFile)
+            doLast {
+                if (!libsodiumDefFile.exists()) {
+                    libsodiumDefFile.parentFile.mkdirs()
+                    libsodiumDefFile.writeText("package = Clibsodium\n")
+                    libsodiumDefFile.appendText("staticLibraries = libsodium.a libsodium-simulator.a\n")
+                    libsodiumDefFile.appendText("libraryPaths = ${libsodiumPath.absolutePath}/ios/lib ${libsodiumPath.absolutePath}/ios-simulators/lib\n")
+                }
             }
         }
-    }
 
     listOf(
         iosArm64(),
@@ -92,7 +95,7 @@ kotlin {
                 headers(
                     "$libsodiumHeaderFilesPath/crypto_aead_xchacha20poly1305.h",
                     "$libsodiumHeaderFilesPath/crypto_core_hchacha20.h",
-                    "$libsodiumHeaderFilesPath/crypto_stream_chacha20.h"
+                    "$libsodiumHeaderFilesPath/crypto_stream_chacha20.h",
                 )
             }
 
@@ -315,7 +318,7 @@ mavenPublishing {
     configure(
         KotlinMultiplatform(
             // whether to publish a sources jar
-            sourcesJar = true,
+            sourcesJar = SourcesJar.Sources(),
         ),
     )