From 8b330ff878a717ee80451294b9e0a728da9c0f76 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 12 Jan 2024 23:40:06 +0800 Subject: [PATCH] refactor: merge shared to composeApp --- gradle.properties | 3 ++- samples/androidApp/build.gradle.kts | 2 +- samples/{shared => composeApp}/build.gradle.kts | 4 ++-- .../src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt | 0 .../kotlin/com/highcapable/flexiui/demo/Components.kt | 0 .../kotlin/com/highcapable/flexiui/demo/Preferences.kt | 0 .../kotlin/com/highcapable/flexiui/demo/Resources.kt | 0 .../commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt | 0 .../com/highcapable/flexiui/demo/screen/LazyListScreen.kt | 0 .../kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt | 0 .../com/highcapable/flexiui/demo/screen/SecondaryScreen.kt | 0 .../src/iosMain/kotlin/MainViewController.kt | 0 samples/desktopApp/build.gradle.kts | 2 +- samples/iosApp/iosApp/AppDelegate.swift | 2 +- settings.gradle.kts | 4 ++-- 15 files changed, 9 insertions(+), 8 deletions(-) rename samples/{shared => composeApp}/build.gradle.kts (94%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt (100%) rename samples/{shared => composeApp}/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt (100%) rename samples/{shared => composeApp}/src/iosMain/kotlin/MainViewController.kt (100%) diff --git a/gradle.properties b/gradle.properties index 8b4df9d..e447fcb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,8 @@ project.flexiui-core.version=0.1.0-alpha01 project.flexiui-resources.namespace=${project.groupName}.resources project.flexiui-resources.iosModuleName=FlexiUIResources project.flexiui-resources.version=0.1.0-alpha01 -project.samples.shared.namespace=${project.groupName}.shared +project.samples.composeApp.namespace=${project.groupName}.shared +project.samples.composeApp.iosModuleName=ComposeApp project.samples.desktopApp.groupName=${project.groupName}.demo project.samples.desktopApp.version=universal project.samples.androidApp.packageName=${project.groupName}.demo diff --git a/samples/androidApp/build.gradle.kts b/samples/androidApp/build.gradle.kts index 46f665e..678d2ef 100644 --- a/samples/androidApp/build.gradle.kts +++ b/samples/androidApp/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { sourceSets { val androidMain by getting { dependencies { - implementation(projects.samples.shared) + implementation(projects.samples.composeApp) } } } diff --git a/samples/shared/build.gradle.kts b/samples/composeApp/build.gradle.kts similarity index 94% rename from samples/shared/build.gradle.kts rename to samples/composeApp/build.gradle.kts index 73364a4..e013f9d 100644 --- a/samples/shared/build.gradle.kts +++ b/samples/composeApp/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { iosSimulatorArm64(), ).forEach { iosTarget -> iosTarget.binaries.framework { - baseName = projects.samples.shared.name + baseName = property.project.samples.composeApp.iosModuleName isStatic = true } } @@ -56,7 +56,7 @@ kotlin { } android { - namespace = property.project.samples.shared.namespace + namespace = property.project.samples.composeApp.namespace compileSdk = property.project.android.compileSdk sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt diff --git a/samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt similarity index 100% rename from samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt rename to samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt diff --git a/samples/shared/src/iosMain/kotlin/MainViewController.kt b/samples/composeApp/src/iosMain/kotlin/MainViewController.kt similarity index 100% rename from samples/shared/src/iosMain/kotlin/MainViewController.kt rename to samples/composeApp/src/iosMain/kotlin/MainViewController.kt diff --git a/samples/desktopApp/build.gradle.kts b/samples/desktopApp/build.gradle.kts index deee3d5..d95b99b 100644 --- a/samples/desktopApp/build.gradle.kts +++ b/samples/desktopApp/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { sourceSets { val desktopMain by getting { dependencies { - implementation(projects.samples.shared) + implementation(projects.samples.composeApp) } } } diff --git a/samples/iosApp/iosApp/AppDelegate.swift b/samples/iosApp/iosApp/AppDelegate.swift index b1fdf38..d3fb5af 100644 --- a/samples/iosApp/iosApp/AppDelegate.swift +++ b/samples/iosApp/iosApp/AppDelegate.swift @@ -1,5 +1,5 @@ import UIKit -import shared +import ComposeApp @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { diff --git a/settings.gradle.kts b/settings.gradle.kts index f31577a..6b086e9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,10 +26,10 @@ sweetProperty { ":samples", ":samples:androidApp", ":samples:desktopApp", - ":samples:shared", + ":samples:composeApp", ":flexiui-resources" ) { sourcesCode { isEnable = false } } } rootProject.name = "FlexiUI" -include(":samples:androidApp", ":samples:desktopApp", ":samples:shared") +include(":samples:androidApp", ":samples:desktopApp", ":samples:composeApp") include(":flexiui-core", ":flexiui-resources") \ No newline at end of file