move to packages

avan1235 · Feb 11, 2024 · 29a2404 · 29a2404
1 parent 38a1dc7
commit 29a2404
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -19,7 +19,6 @@ kotlin {
                 outputFileName = "composeApp.js"
                 val corsPort = env.CORS_PORT.value.toInt()
                 devServer = devServer?.copy(port = corsPort) ?: KotlinWebpackConfig.DevServer(port = corsPort)
-
             }
         }
         binaries.executable()

diff --git a/composeApp/src/commonMain/kotlin/in/procyk/shin/App.kt b/composeApp/src/commonMain/kotlin/in/procyk/shin/App.kt
@@ -5,8 +5,8 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.*
-import `in`.procyk.shin.ShortenRequest
-import `in`.procyk.shin.ShortenResponse
+import `in`.procyk.shin.ui.ShortenRequest
+import `in`.procyk.shin.ui.ShortenResponse
 import `in`.procyk.shin.createHttpClient
 
 @Composable

diff --git a/...otlin/in/procyk/shin/ShortenedProtocol.kt → ...in/procyk/shin/model/ShortenedProtocol.kt b/...otlin/in/procyk/shin/ShortenedProtocol.kt → ...in/procyk/shin/model/ShortenedProtocol.kt
@@ -1,4 +1,4 @@
-package `in`.procyk.shin
+package `in`.procyk.shin.model
 
 internal enum class ShortenedProtocol(val presentableName: String) {
     HTTPS("https"),

diff --git a/...ommonMain/kotlin/in/procyk/shin/QrCode.kt → ...onMain/kotlin/in/procyk/shin/ui/QrCode.kt b/...ommonMain/kotlin/in/procyk/shin/QrCode.kt → ...onMain/kotlin/in/procyk/shin/ui/QrCode.kt
@@ -1,4 +1,4 @@
-package `in`.procyk.shin
+package `in`.procyk.shin.ui
 
 import androidx.compose.foundation.Image
 import androidx.compose.material.MaterialTheme

diff --git a/...n/kotlin/in/procyk/shin/ShortenRequest.kt → ...otlin/in/procyk/shin/ui/ShortenRequest.kt b/...n/kotlin/in/procyk/shin/ShortenRequest.kt → ...otlin/in/procyk/shin/ui/ShortenRequest.kt
@@ -1,4 +1,4 @@
-package `in`.procyk.shin
+package `in`.procyk.shin.ui
 
 import Shorten
 import androidx.compose.foundation.layout.*
@@ -14,6 +14,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import applyIf
+import `in`.procyk.shin.model.ShortenedProtocol
 import io.ktor.client.*
 import io.ktor.client.plugins.resources.*
 import io.ktor.client.statement.*

diff --git a/.../kotlin/in/procyk/shin/ShortenResponse.kt → ...tlin/in/procyk/shin/ui/ShortenResponse.kt b/.../kotlin/in/procyk/shin/ShortenResponse.kt → ...tlin/in/procyk/shin/ui/ShortenResponse.kt
@@ -1,4 +1,4 @@
-package `in`.procyk.shin
+package `in`.procyk.shin.ui
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically

diff --git a/gradle.properties b/gradle.properties
@@ -9,10 +9,16 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true
 
 #Compose
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.macos.enabled=true
+org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.wasm.enabled=true
 
 #MPP
+kotlin.native.useEmbeddableCompilerJar=true
+kotlin.native.binary.memoryModel=experimental
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 
 #Development