app/build.gradle.kts

@@ -51,7 +51,7 @@ android {
 
 dependencies {
     implementation(projects.library.preferences)
-    implementation(projects.shared.stargate)
+    implementation(projects.library.stargate)
 
     implementation(platform(libs.compose.bom))
     implementation(libs.androidx.activity.compose)

build.gradle.kts

@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.kotlinJvm) apply false
 }

gradle/libs.versions.toml

@@ -40,3 +40,4 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

library/stargate/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    alias(libs.plugins.kotlinJvm)
+}
+
+dependencies {
+    implementation(projects.shared.crypto)
+
+    implementation(libs.cryptography.bigint)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.websockets)
+
+    testImplementation(libs.kotlin.test)
+}

settings.gradle.kts

@@ -21,4 +21,4 @@ dependencyResolutionManagement {
 include(":app")
 include(":shared:crypto")
 include(":library:preferences")
-include(":shared:stargate")
+include(":library:stargate")

shared/stargate/build.gradle.kts

@@ -1,49 +0,0 @@
-plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidLibrary)
-}
-
-kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
-    }
-
-    jvm()
-
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
-
-    sourceSets {
-        commonMain.dependencies {
-            implementation(projects.shared.crypto)
-
-            implementation(libs.cryptography.bigint)
-            implementation(libs.ktor.client.cio)
-            implementation(libs.ktor.client.core)
-            implementation(libs.ktor.client.websockets)
-        }
-
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-        }
-    }
-}
-
-android {
-    namespace = "net.agorise.shared.stargate"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}