diff --git a/build.gradle.kts b/build.gradle.kts index 4e90cd1..319a144 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,27 +1,30 @@ plugins { - kotlin("jvm") version "1.7.20" apply false - id("org.jetbrains.compose") version "1.2.1" apply false - id("nebula.maven-publish") version "18.0.0" apply false - id("nebula.source-jar") version "18.0.0" apply false - id("nebula.info") version "11.0.1" apply false - id("com.bybutter.sisyphus.project") version "1.5.31" apply false - id("nebula.contacts") version "5.1.0" + id("com.bybutter.sisyphus.project") version "2.1.0" apply false + id("com.netflix.nebula.contacts") version "7.0.1" + id("com.netflix.nebula.info") version "12.1.6" apply false + id("com.netflix.nebula.maven-publish") version "20.3.0" apply false + id("com.netflix.nebula.source-jar") version "20.3.0" apply false id("org.jetbrains.changelog") version "1.3.0" + id("org.jetbrains.compose") version "1.5.2" apply false + kotlin("jvm") version "1.9.10" apply false } allprojects { - apply(plugin = "nebula.contacts") - apply(plugin = "nebula.info") + apply(plugin = "com.netflix.nebula.contacts") + apply(plugin = "com.netflix.nebula.info") group = "com.bybutter.compose" - version = "2.1.0" + version = "2.2.0" contacts { - addPerson("higan@live.cn", delegateClosureOf { - moniker = "higan" - github = "devkanro" - roles.add("owner") - }) + addPerson( + "higan@live.cn", + delegateClosureOf { + moniker = "higan" + github = "devkanro" + roles.add("owner") + }, + ) } } @@ -43,4 +46,4 @@ subprojects { changelog { version.set(project.version.toString()) groups.set(emptyList()) -} \ No newline at end of file +} diff --git a/classic/build.gradle.kts b/classic/build.gradle.kts index b9133e4..2c8fc01 100644 --- a/classic/build.gradle.kts +++ b/classic/build.gradle.kts @@ -1,9 +1,10 @@ plugins { kotlin("jvm") `java-library` - id("nebula.maven-publish") - id("nebula.source-jar") + id("com.netflix.nebula.maven-publish") + id("com.netflix.nebula.source-jar") id("com.bybutter.sisyphus.project") + id("org.jetbrains.compose") } description = "JetBrains UI Kit for Compose Desktop" @@ -16,7 +17,7 @@ dependencies { } tasks.withType() { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" kotlinOptions.freeCompilerArgs += listOf( // "-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true" ) diff --git a/classic/src/main/kotlin/io/kanro/compose/jetbrains/control/Text.kt b/classic/src/main/kotlin/io/kanro/compose/jetbrains/control/Text.kt index 0719a02..21d7a06 100644 --- a/classic/src/main/kotlin/io/kanro/compose/jetbrains/control/Text.kt +++ b/classic/src/main/kotlin/io/kanro/compose/jetbrains/control/Text.kt @@ -60,7 +60,7 @@ fun Text( emptyMap(), onTextLayout, style, - textColors + textColors, ) } @@ -102,18 +102,19 @@ fun Text( fontFamily = fontFamily, textDecoration = textDecoration, fontStyle = fontStyle, - letterSpacing = letterSpacing - ) + letterSpacing = letterSpacing, + ), ) BasicText( - text, - modifier, - mergedStyle, - onTextLayout, - overflow, - softWrap, - maxLines, - inlineContent + text = text, + modifier = modifier, + style = mergedStyle, + onTextLayout = onTextLayout, + overflow = overflow, + softWrap = softWrap, + maxLines = maxLines, + minLines = 1, + inlineContent = inlineContent, ) } diff --git a/expui/build.gradle.kts b/expui/build.gradle.kts index c3b6105..5ff5b27 100644 --- a/expui/build.gradle.kts +++ b/expui/build.gradle.kts @@ -1,8 +1,9 @@ plugins { kotlin("jvm") - id("nebula.maven-publish") - id("nebula.source-jar") + id("com.netflix.nebula.maven-publish") + id("com.netflix.nebula.source-jar") id("com.bybutter.sisyphus.project") + id("org.jetbrains.compose") `java-library` } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 669386b..fce403e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists