From 55ddac2bc7114d7fa4ddfd5f71246b5a7ec09e59 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 23 Mar 2024 13:56:47 +0100 Subject: [PATCH] Gradle: use simpler Kotlin DSL property assignment https://blog.gradle.org/simpler-kotlin-dsl-property-assignment --- .../kotlin/flatlaf-cpp-library.gradle.kts | 2 +- .../main/kotlin/flatlaf-publish.gradle.kts | 24 +++++++++---------- .../main/kotlin/flatlaf-toolchain.gradle.kts | 2 +- flatlaf-core/build.gradle.kts | 14 +++++------ .../flatlaf-fonts-inter/build.gradle.kts | 4 ++-- .../build.gradle.kts | 4 ++-- .../flatlaf-natives-linux/build.gradle.kts | 2 +- .../flatlaf-natives-macos/build.gradle.kts | 4 ++-- .../flatlaf-natives-windows/build.gradle.kts | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/buildSrc/src/main/kotlin/flatlaf-cpp-library.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-cpp-library.gradle.kts index abacf9ec..25213aa2 100644 --- a/buildSrc/src/main/kotlin/flatlaf-cpp-library.gradle.kts +++ b/buildSrc/src/main/kotlin/flatlaf-cpp-library.gradle.kts @@ -27,7 +27,7 @@ library { } with( linkTask.get() ) { if( name.contains( "Release" ) ) - debuggable.set( false ) + debuggable = false } } } diff --git a/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts index 97afb4f1..f7575003 100644 --- a/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts @@ -44,34 +44,34 @@ publishing { pom { afterEvaluate { - this@pom.name.set( extension.name ) - this@pom.description.set( extension.description ) + this@pom.name = extension.name + this@pom.description = extension.description } - url.set( "https://github.com/JFormDesigner/FlatLaf" ) + url = "https://github.com/JFormDesigner/FlatLaf" licenses { license { - name.set( "The Apache License, Version 2.0" ) - url.set( "https://www.apache.org/licenses/LICENSE-2.0.txt" ) + name = "The Apache License, Version 2.0" + url = "https://www.apache.org/licenses/LICENSE-2.0.txt" } } developers { developer { - name.set( "Karl Tauber" ) - organization.set( "FormDev Software GmbH" ) - organizationUrl.set( "https://www.formdev.com/" ) + name = "Karl Tauber" + organization = "FormDev Software GmbH" + organizationUrl = "https://www.formdev.com/" } } scm { - connection.set( "scm:git:git://github.com/JFormDesigner/FlatLaf.git" ) - url.set( "https://github.com/JFormDesigner/FlatLaf" ) + connection = "scm:git:git://github.com/JFormDesigner/FlatLaf.git" + url = "https://github.com/JFormDesigner/FlatLaf" } issueManagement { - system.set( "GitHub" ) - url.set( "https://github.com/JFormDesigner/FlatLaf/issues" ) + system = "GitHub" + url = "https://github.com/JFormDesigner/FlatLaf/issues" } } diff --git a/buildSrc/src/main/kotlin/flatlaf-toolchain.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-toolchain.gradle.kts index b9ae0f14..fd0257b8 100644 --- a/buildSrc/src/main/kotlin/flatlaf-toolchain.gradle.kts +++ b/buildSrc/src/main/kotlin/flatlaf-toolchain.gradle.kts @@ -21,6 +21,6 @@ plugins { val toolchainJavaVersion = System.getProperty( "toolchain" ) if( !toolchainJavaVersion.isNullOrEmpty() ) { java.toolchain { - languageVersion.set( JavaLanguageVersion.of( toolchainJavaVersion ) ) + languageVersion = JavaLanguageVersion.of( toolchainJavaVersion ) } } diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts index dab5d3bf..11dd19b7 100644 --- a/flatlaf-core/build.gradle.kts +++ b/flatlaf-core/build.gradle.kts @@ -42,11 +42,11 @@ java { tasks { compileJava { // generate JNI headers - options.headerOutputDirectory.set( layout.buildDirectory.dir( "generated/jni-headers" ) ) + options.headerOutputDirectory = layout.buildDirectory.dir( "generated/jni-headers" ) } jar { - archiveBaseName.set( "flatlaf" ) + archiveBaseName = "flatlaf" doLast { ReorderJarEntries.reorderJarEntries( outputs.files.singleFile ); @@ -54,20 +54,20 @@ tasks { } named( "sourcesJar" ) { - archiveBaseName.set( "flatlaf" ) + archiveBaseName = "flatlaf" } named( "javadocJar" ) { - archiveBaseName.set( "flatlaf" ) + archiveBaseName = "flatlaf" } register( "jarNoNatives" ) { group = "build" dependsOn( "jar" ) - archiveBaseName.set( "flatlaf" ) - archiveClassifier.set( "no-natives" ) - archiveExtension.set( "jar" ) + archiveBaseName = "flatlaf" + archiveClassifier = "no-natives" + archiveExtension = "jar" destinationDirectory = layout.buildDirectory.dir( "libs" ) from( zipTree( jar.get().archiveFile.get().asFile ) ) diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts index 51c8b322..d35b308c 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts +++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts @@ -73,8 +73,8 @@ publishing { pom { licenses { license { - name.set( "SIL OPEN FONT LICENSE Version 1.1" ) - url.set( "https://choosealicense.com/licenses/ofl-1.1/" ) + name = "SIL OPEN FONT LICENSE Version 1.1" + url = "https://choosealicense.com/licenses/ofl-1.1/" } } } diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts index 492eb2fa..f6d58ebf 100644 --- a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts @@ -73,8 +73,8 @@ publishing { pom { licenses { license { - name.set( "SIL OPEN FONT LICENSE Version 1.1" ) - url.set( "https://choosealicense.com/licenses/ofl-1.1/" ) + name = "SIL OPEN FONT LICENSE Version 1.1" + url = "https://choosealicense.com/licenses/ofl-1.1/" } } } diff --git a/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts b/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts index b76fb670..4fcb9838 100644 --- a/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts @@ -25,7 +25,7 @@ flatlafJniHeaders { } library { - targetMachines.set( listOf( machines.linux.x86_64 ) ) + targetMachines = listOf( machines.linux.x86_64 ) } var javaHome = System.getProperty( "java.home" ) diff --git a/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts b/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts index 322b1998..cf650d74 100644 --- a/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts @@ -30,10 +30,10 @@ flatlafJniHeaders { } library { - targetMachines.set( listOf( + targetMachines = listOf( machines.macOS.architecture( "arm64" ), machines.macOS.x86_64 - ) ) + ) } var javaHome = System.getProperty( "java.home" ) diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts index 6849a62a..b7e8ff3e 100644 --- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts @@ -29,11 +29,11 @@ flatlafJniHeaders { } library { - targetMachines.set( listOf( + targetMachines = listOf( machines.windows.x86, machines.windows.x86_64, machines.windows.architecture( "aarch64" ) - ) ) + ) } var javaHome = System.getProperty( "java.home" )