From ea7af30fd24094e8e8c6c5de9d6237ede0114eec Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Fri, 12 Jan 2024 23:29:34 +0800
Subject: [PATCH] refactor: merge shared to composeApp

---
 androidApp/build.gradle.kts                                   | 2 +-
 {shared => composeApp}/build.gradle.kts                       | 4 ++--
 {shared => composeApp}/src/commonMain/kotlin/App.kt           | 0
 .../src/iosMain/kotlin/MainViewController.kt                  | 0
 desktopApp/build.gradle.kts                                   | 2 +-
 iosApp/iosApp/AppDelegate.swift                               | 2 +-
 settings.gradle.kts                                           | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {shared => composeApp}/build.gradle.kts (97%)
 rename {shared => composeApp}/src/commonMain/kotlin/App.kt (100%)
 rename {shared => composeApp}/src/iosMain/kotlin/MainViewController.kt (100%)

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index c309b84..84b96d2 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
     sourceSets {
         val androidMain by getting {
             dependencies {
-                implementation(projects.shared)
+                implementation(projects.composeApp)
             }
         }
     }
diff --git a/shared/build.gradle.kts b/composeApp/build.gradle.kts
similarity index 97%
rename from shared/build.gradle.kts
rename to composeApp/build.gradle.kts
index 6f19e5c..7c7b1ad 100644
--- a/shared/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -10,10 +10,10 @@ kotlin {
     listOf(
         iosX64(),
         iosArm64(),
-        iosSimulatorArm64(),
+        iosSimulatorArm64()
     ).forEach { iosTarget ->
         iosTarget.binaries.framework {
-            baseName = "shared"
+            baseName = "ComposeApp"
             isStatic = true
         }
     }
diff --git a/shared/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt
similarity index 100%
rename from shared/src/commonMain/kotlin/App.kt
rename to composeApp/src/commonMain/kotlin/App.kt
diff --git a/shared/src/iosMain/kotlin/MainViewController.kt b/composeApp/src/iosMain/kotlin/MainViewController.kt
similarity index 100%
rename from shared/src/iosMain/kotlin/MainViewController.kt
rename to composeApp/src/iosMain/kotlin/MainViewController.kt
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
index d540598..2695e74 100644
--- a/desktopApp/build.gradle.kts
+++ b/desktopApp/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
     sourceSets {
         val desktopMain by getting {
             dependencies {
-                implementation(projects.shared)
+                implementation(projects.composeApp)
             }
         }
     }
diff --git a/iosApp/iosApp/AppDelegate.swift b/iosApp/iosApp/AppDelegate.swift
index ba5948b..82d6ea8 100644
--- a/iosApp/iosApp/AppDelegate.swift
+++ b/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 a343ce7..eaeb3c0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,4 +17,4 @@ sweetProperty {
     rootProject { all { isEnable = false } }
 }
 rootProject.name = "__PROJECT_NAME__"
-include(":androidApp", ":desktopApp", ":shared")
\ No newline at end of file
+include(":androidApp", ":desktopApp", ":composeApp")
\ No newline at end of file