remove unused modules

stslex · Nov 24, 2023 · bb79a8a · bb79a8a
1 parent 28f7eac
commit bb79a8a
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 192 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -45,7 +45,6 @@ kotlin {
             implementation(project(":core:ui"))
             implementation(project(":feature:home"))
 
-            implementation(projects.shared)
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)

diff --git a/core/core/build.gradle.kts b/core/core/build.gradle.kts
@@ -14,7 +14,7 @@ kotlin {
     }
 
     jvm("desktop")
-    
+
     listOf(
         iosX64(),
         iosArm64(),
@@ -27,20 +27,14 @@ kotlin {
     }
 
     sourceSets {
-        val desktopMain by getting
-
         commonMain.dependencies {
             implementation(libs.kermit)
-            implementation(projects.shared)
             implementation(compose.runtime)
             implementation(compose.foundation)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
     }
 }
 

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -29,12 +29,9 @@ kotlin {
     }
 
     sourceSets {
-        val desktopMain by getting
-
         commonMain.dependencies {
             implementation(project(":core:core"))
 
-            implementation(projects.shared)
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)
@@ -44,9 +41,6 @@ kotlin {
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
     }
 }
 

diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -29,13 +29,10 @@ kotlin {
     }
 
     sourceSets {
-        val desktopMain by getting
-
         commonMain.dependencies {
             implementation(project(":core:core"))
             implementation(project(":core:ui"))
 
-            implementation(projects.shared)
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)
@@ -45,9 +42,6 @@ kotlin {
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
     }
 }
 

diff --git a/feature/home/src/commonMain/kotlin/com/stslex/feature/home/HomeScreen.kt b/feature/home/src/commonMain/kotlin/com/stslex/feature/home/HomeScreen.kt
@@ -1,16 +1,17 @@
 package com.stslex.feature.home
 
-import Greeting
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Button
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -20,7 +21,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.painterResource
 
 @OptIn(ExperimentalResourceApi::class)
 @Composable
@@ -33,7 +33,7 @@ fun HomeScreen(
             .background(MaterialTheme.colors.background)
     ) {
         val defaultGreetState = "Hello World!"
-        val clickedGreetState = "Compose: ${Greeting().greet()}"
+        val clickedGreetState = "Compose: Greeting"
         var isClicked by remember { mutableStateOf(false) }
         val greetingText by remember {
             derivedStateOf {
@@ -56,9 +56,10 @@ fun HomeScreen(
                 Text(greetingText)
             }
             AnimatedVisibility(isClicked) {
-                Image(
-                    painterResource("compose-multiplatform.xml"),
-                    null
+                Icon(
+                    imageVector = Icons.Default.Home,
+                    contentDescription = null,
+                    tint = MaterialTheme.colors.primary
                 )
             }
         }

diff --git a/feature/home/src/commonMain/resources/compose-multiplatform.xml b/feature/home/src/commonMain/resources/compose-multiplatform.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,5 @@
 [versions]
 kermit = "2.0.2"
-ktor = "2.3.6"
 logback = "1.4.11"
 compose = "1.5.4"
 compose-plugin = "1.5.10"
@@ -24,10 +23,6 @@ kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
-ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" }
-ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" }
-ktor-server-tests = { module = "io.ktor:ktor-server-tests-jvm", version.ref = "ktor" }
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
@@ -41,9 +36,10 @@ androidx-material = { group = "com.google.android.material", name = "material",
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 
+#todo check if this is needed
+logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 [plugins]
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
diff --git a/server/src/main/kotlin/com/stslex/wizard/Application.kt b/server/src/main/kotlin/com/stslex/wizard/Application.kt
diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,8 +18,6 @@ dependencyResolutionManagement {
     }
 }
 
-include(":server")
-include(":shared")
 include(":composeApp")
 include(":core:core")
 include(":core:ui")

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
diff --git a/shared/src/androidMain/kotlin/Platform.android.kt b/shared/src/androidMain/kotlin/Platform.android.kt
diff --git a/shared/src/commonMain/kotlin/Constants.kt b/shared/src/commonMain/kotlin/Constants.kt
diff --git a/shared/src/commonMain/kotlin/Greeting.kt b/shared/src/commonMain/kotlin/Greeting.kt
diff --git a/shared/src/commonMain/kotlin/Platform.kt b/shared/src/commonMain/kotlin/Platform.kt
diff --git a/shared/src/iosMain/kotlin/Platform.ios.kt b/shared/src/iosMain/kotlin/Platform.ios.kt
diff --git a/shared/src/jvmMain/kotlin/Platform.jvm.kt b/shared/src/jvmMain/kotlin/Platform.jvm.kt