make shared module android only

MateriiApps · Jun 23, 2024 · 85edd44 · 85edd44
1 parent ddb918e
commit 85edd44
Show file tree

Hide file tree

Showing 41 changed files with 52 additions and 345 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -22,6 +22,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -1,8 +1,7 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.aboutlibraries)
 }
@@ -15,35 +14,22 @@ android {
         minSdk = 21
     }
 
-    buildFeatures {
-        buildConfig = true
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
-kotlin {
-    androidTarget()
-    jvm("desktop")
+dependencies {
+    api(compose.runtime)
+    api(libs.bundles.kotlinx)
 
-    jvmToolchain(17)
+    api(libs.aboutlibraries.core)
+    api(libs.apollo.runtime)
+    api(libs.apollo.normalized.cache)
+    api(libs.koin.core)
+    api(libs.multiplatform.settings)
 
-    sourceSets {
-        commonMain {
-            dependencies {
-                api(compose.runtime)
-                api(libs.bundles.kotlinx)
-
-                api(libs.aboutlibraries.core)
-                api(libs.apollo.runtime)
-                api(libs.apollo.normalized.cache)
-                api(libs.koin.core)
-                api(libs.multiplatform.settings)
-            }
-        }
-        val androidMain by getting {
-            dependencies {
-                implementation(libs.androidx.browser)
-                implementation(libs.androidx.core.ktx)
-            }
-        }
-    }
+    implementation(libs.androidx.browser)
+    implementation(libs.androidx.core.ktx)
 }
diff --git a/shared/src/androidMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt b/shared/src/androidMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/di/modules/ManagerModule.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/di/modules/ManagerModule.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/di/modules/SettingsModule.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/di/modules/SettingsModule.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/DownloadManager.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/DownloadManager.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/LibraryManager.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/LibraryManager.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/ShareManager.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/domain/manager/ShareManager.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/LinkHandler.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/LinkHandler.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/Logger.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/Logger.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt
diff --git a/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/SettingsProvider.kt b/shared/src/commonMain/kotlin/com/materiiapps/gloom/utils/SettingsProvider.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/di/modules/ManagerModule.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/di/modules/ManagerModule.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/di/modules/SettingsModule.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/di/modules/SettingsModule.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/DownloadManager.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/DownloadManager.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/LibraryManager.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/LibraryManager.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/ShareManager.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/domain/manager/ShareManager.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/LinkHandler.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/LinkHandler.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/Logger.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/Logger.kt
diff --git a/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt b/shared/src/desktopMain/kotlin/com/materiiapps/gloom/utils/PlatformUtils.kt