From 3d496c99c14106a7f433d01a6a9a1301cc89844a Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 2 Aug 2022 22:10:32 +0530 Subject: [PATCH] model: migrate to JVM-only --- model/build.gradle.kts | 16 ++-------------- model/src/androidMain/AndroidManifest.xml | 1 - .../kotlin/dev/msfjarvis/claw/model/Comment.kt | 0 .../dev/msfjarvis/claw/model/LobstersPost.kt | 0 .../msfjarvis/claw/model/LobstersPostDetails.kt | 0 .../kotlin/dev/msfjarvis/claw/model/User.kt | 0 settings.gradle.kts | 6 ++++-- 7 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 model/src/androidMain/AndroidManifest.xml rename model/src/{commonMain => main}/kotlin/dev/msfjarvis/claw/model/Comment.kt (100%) rename model/src/{commonMain => main}/kotlin/dev/msfjarvis/claw/model/LobstersPost.kt (100%) rename model/src/{commonMain => main}/kotlin/dev/msfjarvis/claw/model/LobstersPostDetails.kt (100%) rename model/src/{commonMain => main}/kotlin/dev/msfjarvis/claw/model/User.kt (100%) diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 53ae549a..9656161f 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -1,21 +1,9 @@ @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") plugins { - kotlin("multiplatform") + kotlin("jvm") kotlin("plugin.serialization") id("dev.msfjarvis.claw.kotlin-common") - id("dev.msfjarvis.claw.android-library") } -kotlin { - android() - jvm() - sourceSets["commonMain"].apply { - dependencies { implementation(libs.kotlinx.serialization.core) } - } -} - -android { - namespace = "dev.msfjarvis.claw.model" - sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") -} +dependencies { implementation(libs.kotlinx.serialization.core) } diff --git a/model/src/androidMain/AndroidManifest.xml b/model/src/androidMain/AndroidManifest.xml deleted file mode 100644 index cc947c56..00000000 --- a/model/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/model/src/commonMain/kotlin/dev/msfjarvis/claw/model/Comment.kt b/model/src/main/kotlin/dev/msfjarvis/claw/model/Comment.kt similarity index 100% rename from model/src/commonMain/kotlin/dev/msfjarvis/claw/model/Comment.kt rename to model/src/main/kotlin/dev/msfjarvis/claw/model/Comment.kt diff --git a/model/src/commonMain/kotlin/dev/msfjarvis/claw/model/LobstersPost.kt b/model/src/main/kotlin/dev/msfjarvis/claw/model/LobstersPost.kt similarity index 100% rename from model/src/commonMain/kotlin/dev/msfjarvis/claw/model/LobstersPost.kt rename to model/src/main/kotlin/dev/msfjarvis/claw/model/LobstersPost.kt diff --git a/model/src/commonMain/kotlin/dev/msfjarvis/claw/model/LobstersPostDetails.kt b/model/src/main/kotlin/dev/msfjarvis/claw/model/LobstersPostDetails.kt similarity index 100% rename from model/src/commonMain/kotlin/dev/msfjarvis/claw/model/LobstersPostDetails.kt rename to model/src/main/kotlin/dev/msfjarvis/claw/model/LobstersPostDetails.kt diff --git a/model/src/commonMain/kotlin/dev/msfjarvis/claw/model/User.kt b/model/src/main/kotlin/dev/msfjarvis/claw/model/User.kt similarity index 100% rename from model/src/commonMain/kotlin/dev/msfjarvis/claw/model/User.kt rename to model/src/main/kotlin/dev/msfjarvis/claw/model/User.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index c2e8ab33..79ed6c42 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -94,8 +94,10 @@ dependencyResolutionManagement { rootProject.name = "Claw" -enableFeaturePreview( - "TYPESAFE_PROJECT_ACCESSORS" +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +include( + "model", ) // include(":android")