BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 03:24:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: merge shared to composeApp

Browse Source
This commit is contained in:
fankesyooni
2024-01-12 23:40:06 +08:00
parent d2bb28ef24
commit 8b330ff878
15 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gradle.properties
View File

@@ -16,7 +16,8 @@ project.flexiui-core.version=0.1.0-alpha01
project.flexiui-resources.namespace=${project.groupName}.resources project.flexiui-resources.namespace=${project.groupName}.resources
project.flexiui-resources.iosModuleName=FlexiUIResources project.flexiui-resources.iosModuleName=FlexiUIResources
project.flexiui-resources.version=0.1.0-alpha01 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.groupName=${project.groupName}.demo
project.samples.desktopApp.version=universal project.samples.desktopApp.version=universal
project.samples.androidApp.packageName=${project.groupName}.demo project.samples.androidApp.packageName=${project.groupName}.demo

2
samples/androidApp/build.gradle.kts
View File

@@ -10,7 +10,7 @@ kotlin {
sourceSets { sourceSets {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
implementation(projects.samples.shared) implementation(projects.samples.composeApp)
} }
} }
} }

4
samples/shared/build.gradle.kts → samples/composeApp/build.gradle.kts
View File

@@ -13,7 +13,7 @@ kotlin {
iosSimulatorArm64(), iosSimulatorArm64(),
).forEach { iosTarget -> ).forEach { iosTarget ->
iosTarget.binaries.framework { iosTarget.binaries.framework {
baseName = projects.samples.shared.name baseName = property.project.samples.composeApp.iosModuleName
isStatic = true isStatic = true
} }
} }
@@ -56,7 +56,7 @@ kotlin {
} }
android { android {
namespace = property.project.samples.shared.namespace namespace = property.project.samples.composeApp.namespace
compileSdk = property.project.android.compileSdk compileSdk = property.project.android.compileSdk
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Preferences.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Resources.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Router.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/MainScreen.kt
View File

0
samples/shared/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt → samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/SecondaryScreen.kt
View File

0
samples/shared/src/iosMain/kotlin/MainViewController.kt → samples/composeApp/src/iosMain/kotlin/MainViewController.kt
View File

2
samples/desktopApp/build.gradle.kts
View File

@@ -12,7 +12,7 @@ kotlin {
sourceSets { sourceSets {
val desktopMain by getting { val desktopMain by getting {
dependencies { dependencies {
implementation(projects.samples.shared) implementation(projects.samples.composeApp)
} }
} }
} }

2
samples/iosApp/iosApp/AppDelegate.swift
View File

@@ -1,5 +1,5 @@
import UIKit import UIKit
import shared import ComposeApp
@UIApplicationMain @UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate { class AppDelegate: UIResponder, UIApplicationDelegate {

4
settings.gradle.kts
View File

@@ -26,10 +26,10 @@ sweetProperty {
":samples", ":samples",
":samples:androidApp", ":samples:androidApp",
":samples:desktopApp", ":samples:desktopApp",
":samples:shared", ":samples:composeApp",
":flexiui-resources" ":flexiui-resources"
) { sourcesCode { isEnable = false } } ) { sourcesCode { isEnable = false } }
} }
rootProject.name = "FlexiUI" rootProject.name = "FlexiUI"
include(":samples:androidApp", ":samples:desktopApp", ":samples:shared") include(":samples:androidApp", ":samples:desktopApp", ":samples:composeApp")
include(":flexiui-core", ":flexiui-resources") include(":flexiui-core", ":flexiui-resources")