chore: bump dependencies & support Kotlin 2.0.0

This commit is contained in:
2024-06-20 12:27:36 +08:00
parent bda4c7da3d
commit adac561086
9 changed files with 22 additions and 11 deletions

View File

@@ -7,6 +7,7 @@ plugins {
autowire(libs.plugins.android.application) apply false autowire(libs.plugins.android.application) apply false
autowire(libs.plugins.android.library) apply false autowire(libs.plugins.android.library) apply false
autowire(libs.plugins.jetbrains.compose) apply false autowire(libs.plugins.jetbrains.compose) apply false
autowire(libs.plugins.compose.compiler) apply false
autowire(libs.plugins.maven.publish) apply false autowire(libs.plugins.maven.publish) apply false
} }

View File

@@ -2,6 +2,7 @@ plugins {
autowire(libs.plugins.kotlin.multiplatform) autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.library) autowire(libs.plugins.android.library)
autowire(libs.plugins.jetbrains.compose) autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
autowire(libs.plugins.maven.publish) autowire(libs.plugins.maven.publish)
} }

View File

@@ -2,6 +2,7 @@ plugins {
autowire(libs.plugins.kotlin.multiplatform) autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.library) autowire(libs.plugins.android.library)
autowire(libs.plugins.jetbrains.compose) autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
autowire(libs.plugins.maven.publish) autowire(libs.plugins.maven.publish)
} }

View File

@@ -5,6 +5,7 @@ android.nonTransitiveRClass=true
kotlin.code.style=official kotlin.code.style=official
kotlin.incremental.useClasspathSnapshot=true kotlin.incremental.useClasspathSnapshot=true
kotlin.mpp.applyDefaultHierarchyTemplate=false kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
# Project Configuration # Project Configuration
project.name=FlexiUI project.name=FlexiUI

View File

@@ -11,19 +11,22 @@ repositories:
plugins: plugins:
org.jetbrains.kotlin.multiplatform: org.jetbrains.kotlin.multiplatform:
alias: kotlin-multiplatform alias: kotlin-multiplatform
version: 1.9.22 version: 2.0.0
org.jetbrains.compose: org.jetbrains.compose:
alias: jetbrains-compose alias: jetbrains-compose
version: 1.5.12 version: 1.6.11
org.jetbrains.kotlin.plugin.compose:
alias: compose-compiler
version-ref: kotlin-multiplatform
com.android.application: com.android.application:
alias: android-application alias: android-application
version: 8.2.2 version: 8.5.0
com.android.library: com.android.library:
alias: android-library alias: android-library
version-ref: android-application version-ref: android-application
com.vanniktech.maven.publish: com.vanniktech.maven.publish:
alias: maven-publish alias: maven-publish
version: 0.27.0 version: 0.28.0
libraries: libraries:
org.jetbrains.compose.material: org.jetbrains.compose.material:
@@ -36,12 +39,12 @@ libraries:
androidx.compose.runtime: androidx.compose.runtime:
runtime-android: runtime-android:
alias: androidx-compose-android alias: androidx-compose-android
version: 1.6.1 version: 1.6.8
com.highcapable.betterandroid: com.highcapable.betterandroid:
ui-component: ui-component:
version: 1.0.5 version: 1.0.5
ui-extension: ui-extension:
version: 1.0.3 version: 1.0.4
system-extension: system-extension:
version: 1.0.1 version: 1.0.1
compose-extension: compose-extension:
@@ -50,18 +53,18 @@ libraries:
version: 0.1.0 version: 0.1.0
androidx.activity: androidx.activity:
activity: activity:
version: 1.8.2 version: 1.9.0
activity-compose: activity-compose:
version: 1.8.2 version: 1.9.0
androidx.core: androidx.core:
core-ktx: core-ktx:
version: 1.12.0 version: 1.13.1
androidx.appcompat: androidx.appcompat:
appcompat: appcompat:
version: 1.6.1 version: 1.7.0
com.google.android.material: com.google.android.material:
material: material:
version: 1.11.0 version: 1.12.0
androidx.test.ext: androidx.test.ext:
junit: junit:
version: 1.1.5 version: 1.1.5

View File

@@ -2,6 +2,7 @@ plugins {
autowire(libs.plugins.kotlin.multiplatform) autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.application) autowire(libs.plugins.android.application)
autowire(libs.plugins.jetbrains.compose) autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
} }
kotlin { kotlin {

View File

@@ -2,6 +2,7 @@ plugins {
autowire(libs.plugins.kotlin.multiplatform) autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.android.library) autowire(libs.plugins.android.library)
autowire(libs.plugins.jetbrains.compose) autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
} }
kotlin { kotlin {

View File

@@ -1,6 +1,7 @@
plugins { plugins {
autowire(libs.plugins.kotlin.multiplatform) autowire(libs.plugins.kotlin.multiplatform)
autowire(libs.plugins.jetbrains.compose) autowire(libs.plugins.jetbrains.compose)
autowire(libs.plugins.compose.compiler)
} }
group = property.project.samples.desktopApp.groupName group = property.project.samples.desktopApp.groupName

View File

@@ -27,6 +27,7 @@ sweetProperty {
":samples:androidApp", ":samples:androidApp",
":samples:desktopApp", ":samples:desktopApp",
":samples:composeApp", ":samples:composeApp",
":flexiui-core",
":flexiui-resources" ":flexiui-resources"
) { sourcesCode { isEnable = false } } ) { sourcesCode { isEnable = false } }
} }