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

chore: migrate to version catalog, Gropify

Browse Source
This commit is contained in:
fankesyooni
2025-11-12 17:32:55 +08:00
parent b72fd73e9b
commit 36e8350f84
11 changed files with 175 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
plugins {
autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.application)
autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}
kotlin {
@@ -18,19 +18,19 @@ kotlin {
}
android {
namespace = property.project.samples.androidApp.packageName
compileSdk = property.project.android.compileSdk
namespace = gropify.project.samples.androidApp.packageName
compileSdk = gropify.project.android.compileSdk
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
applicationId = property.project.samples.androidApp.packageName
minSdk = property.project.android.minSdk
targetSdk = property.project.android.targetSdk
versionName = property.project.samples.androidApp.versionName
versionCode = property.project.samples.androidApp.versionCode
applicationId = gropify.project.samples.androidApp.packageName
minSdk = gropify.project.android.minSdk
targetSdk = gropify.project.android.targetSdk
versionName = gropify.project.samples.androidApp.versionName
versionCode = gropify.project.samples.androidApp.versionCode
}
buildTypes {
release {
@@ -45,7 +45,7 @@ android {
}
}
val composeAndroidVersion = dependencies.androidx.compose.android.version
val composeAndroidVersion = libs.androidx.compose.android.get().version ?: error("Unresolved compose android version.")
configurations.all {
resolutionStrategy.eachDependency {

36
samples/composeApp/build.gradle.kts
View File

@@ -1,42 +1,46 @@
plugins {
autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.library)
autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}
kotlin {
androidTarget()
jvm("desktop")
listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64(),
).forEach { iosTarget ->
iosTarget.binaries.framework {
baseName = property.project.samples.composeApp.iosModuleName
baseName = gropify.project.samples.composeApp.iosModuleName
isStatic = true
}
}
jvmToolchain(17)
sourceSets {
val commonMain by getting {
dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
api(projects.flexiuiCore)
api(com.highcapable.betterandroid.compose.multiplatform)
api(libs.betterandroid.compose.multiplatform)
}
}
val androidMain by getting {
dependencies {
api(androidx.core.core.ktx)
api(androidx.appcompat.appcompat)
api(androidx.activity.activity)
api(androidx.activity.activity.compose)
api(com.highcapable.betterandroid.ui.component)
api(com.highcapable.betterandroid.ui.extension)
api(com.highcapable.betterandroid.system.extension)
api(libs.androidx.core.ktx)
api(libs.androidx.appcompat)
api(libs.androidx.activity)
api(libs.androidx.activity.compose)
api(libs.betterandroid.ui.component)
api(libs.betterandroid.ui.extension)
api(libs.betterandroid.system.extension)
}
}
val desktopMain by getting {
@@ -57,15 +61,15 @@ kotlin {
}
android {
namespace = property.project.samples.composeApp.namespace
compileSdk = property.project.android.compileSdk
namespace = gropify.project.samples.composeApp.namespace
compileSdk = gropify.project.android.compileSdk
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = property.project.android.minSdk
minSdk = gropify.project.android.minSdk
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17

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

@@ -1,15 +1,16 @@
plugins {
autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}
group = property.project.samples.desktopApp.groupName
version = property.project.samples.desktopApp.version
group = gropify.project.samples.desktopApp.groupName
version = gropify.project.samples.desktopApp.version
kotlin {
jvm("desktop")
jvmToolchain(17)
sourceSets {
val desktopMain by getting {
dependencies {