From 231ed080412086c3f09e1b5c329b7094cf3d9f8d Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 27 Aug 2024 21:02:14 +0200 Subject: [PATCH] now all gradle versions are up-to-date, updating all .set() notations with = for better readability --- build.gradle.kts | 12 +++--- core/build.gradle.kts | 38 +++++++++---------- dataframe-arrow/build.gradle.kts | 8 ++-- dataframe-excel/build.gradle.kts | 8 ++-- dataframe-jdbc/build.gradle.kts | 8 ++-- dataframe-openapi/build.gradle.kts | 8 ++-- .../idea-examples/movies/build.gradle.kts | 2 +- .../idea-examples/titanic/build.gradle.kts | 2 +- .../idea-examples/youtube/build.gradle.kts | 2 +- .../expressions-converter/build.gradle.kts | 2 +- plugins/kotlin-dataframe/build.gradle.kts | 12 +++--- tests/build.gradle.kts | 8 ++-- 12 files changed, 54 insertions(+), 56 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fa78e51e24..5405fbae22 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -222,7 +222,7 @@ subprojects { } kotlinPublications { - fairDokkaJars.set(false) + fairDokkaJars = false sonatypeSettings( project.findProperty("kds.sonatype.user") as String?, @@ -238,7 +238,7 @@ kotlinPublications { pom { githubRepo("Kotlin", "dataframe") - inceptionYear.set("2021") + inceptionYear = "2021" licenses { apache2() } @@ -252,10 +252,10 @@ kotlinPublications { } publication { - publicationName.set("api") - artifactId.set(projectName) - description.set("Data processing in Kotlin") - packageName.set(artifactId) + publicationName = "api" + artifactId = projectName + description = "Data processing in Kotlin" + packageName = artifactId } localRepositories { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b595177d82..0d3712b398 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -95,7 +95,7 @@ val compileSamplesKotlin = tasks.named("compileSamplesKotlin") { libraries.from(it.libraries) } source(sourceSets["test"].kotlin) - destinationDirectory.set(layout.buildDirectory.dir("classes/testWithOutputs/kotlin")) + destinationDirectory = layout.buildDirectory.dir("classes/testWithOutputs/kotlin") } tasks.withType { @@ -147,14 +147,14 @@ val clearSamplesOutputs by tasks.creating { } val addSamplesToGit by tasks.creating(GitTask::class) { - directory.set(file(".")) - command.set("add") - args.set(listOf("-A", "../docs/StardustDocs/snippets")) + directory = file(".") + command = "add" + args = listOf("-A", "../docs/StardustDocs/snippets") } val copySamplesOutputs = tasks.register("copySamplesOutputs") { group = "documentation" - mainClass.set("org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt") + mainClass = "org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt" dependsOn(clearSamplesOutputs) dependsOn(samplesTest) @@ -305,8 +305,8 @@ korro { groupSamples { - beforeSample.set("\n") - afterSample.set("\n") + beforeSample = "\n" + afterSample = "\n" funSuffix("_properties") { replaceText("NAME", "Properties") @@ -317,8 +317,8 @@ korro { funSuffix("_strings") { replaceText("NAME", "Strings") } - beforeGroup.set("\n") - afterGroup.set("") + beforeGroup = "\n" + afterGroup = "" } } @@ -366,19 +366,17 @@ tasks.withType { } tasks.withType { - kotlinOptions { - freeCompilerArgs = freeCompilerArgs + listOf("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn") + compilerOptions { + freeCompilerArgs.addAll("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn") } } tasks.test { maxHeapSize = "2048m" extensions.configure(kotlinx.kover.api.KoverTaskExtension::class) { - excludes.set( - listOf( - "org.jetbrains.kotlinx.dataframe.jupyter.*", - "org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests", - ), + excludes = listOf( + "org.jetbrains.kotlinx.dataframe.jupyter.*", + "org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests", ) } } @@ -389,10 +387,10 @@ tasks.processJupyterApiResources { kotlinPublications { publication { - publicationName.set("core") - artifactId.set("dataframe-core") - description.set("Dataframe core API") - packageName.set(artifactId) + publicationName = "core" + artifactId = "dataframe-core" + description = "Dataframe core API" + packageName = artifactId } } diff --git a/dataframe-arrow/build.gradle.kts b/dataframe-arrow/build.gradle.kts index e3f10bfa58..ee6a3878a6 100644 --- a/dataframe-arrow/build.gradle.kts +++ b/dataframe-arrow/build.gradle.kts @@ -34,10 +34,10 @@ dependencies { kotlinPublications { publication { - publicationName.set("dataframeArrow") - artifactId.set(project.name) - description.set("Apache Arrow support for Kotlin Dataframe") - packageName.set(artifactId) + publicationName = "dataframeArrow" + artifactId = project.name + description = "Apache Arrow support for Kotlin Dataframe" + packageName = artifactId } } diff --git a/dataframe-excel/build.gradle.kts b/dataframe-excel/build.gradle.kts index 2f14b7dd6c..f3b3255b8f 100644 --- a/dataframe-excel/build.gradle.kts +++ b/dataframe-excel/build.gradle.kts @@ -28,10 +28,10 @@ dependencies { kotlinPublications { publication { - publicationName.set("dataframeExcel") - artifactId.set(project.name) - description.set("Excel support for Kotlin Dataframe") - packageName.set(artifactId) + publicationName = "dataframeExcel" + artifactId = project.name + description = "Excel support for Kotlin Dataframe" + packageName = artifactId } } diff --git a/dataframe-jdbc/build.gradle.kts b/dataframe-jdbc/build.gradle.kts index 705cf87fe1..fab96b88c3 100644 --- a/dataframe-jdbc/build.gradle.kts +++ b/dataframe-jdbc/build.gradle.kts @@ -36,10 +36,10 @@ dependencies { kotlinPublications { publication { - publicationName.set("dataframeJDBC") - artifactId.set(project.name) - description.set("JDBC support for Kotlin Dataframe") - packageName.set(artifactId) + publicationName = "dataframeJDBC" + artifactId = project.name + description = "JDBC support for Kotlin Dataframe" + packageName = artifactId } } diff --git a/dataframe-openapi/build.gradle.kts b/dataframe-openapi/build.gradle.kts index 86d113e84a..5b92ed5b41 100644 --- a/dataframe-openapi/build.gradle.kts +++ b/dataframe-openapi/build.gradle.kts @@ -40,10 +40,10 @@ dependencies { kotlinPublications { publication { - publicationName.set("dataframeOpenApi") - artifactId.set(project.name) - description.set("OpenAPI support for Kotlin Dataframe") - packageName.set(artifactId) + publicationName = "dataframeOpenApi" + artifactId = project.name + description = "OpenAPI support for Kotlin Dataframe" + packageName = artifactId } } diff --git a/examples/idea-examples/movies/build.gradle.kts b/examples/idea-examples/movies/build.gradle.kts index bd47a6e0d3..469cc17df5 100644 --- a/examples/idea-examples/movies/build.gradle.kts +++ b/examples/idea-examples/movies/build.gradle.kts @@ -15,7 +15,7 @@ repositories { mavenLocal() // in case of local dataframe development } -application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.movies.MoviesWithDataClassKt") +application.mainClass = "org.jetbrains.kotlinx.dataframe.examples.movies.MoviesWithDataClassKt" dependencies { // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z") diff --git a/examples/idea-examples/titanic/build.gradle.kts b/examples/idea-examples/titanic/build.gradle.kts index a753923089..e2ea67c14d 100644 --- a/examples/idea-examples/titanic/build.gradle.kts +++ b/examples/idea-examples/titanic/build.gradle.kts @@ -13,7 +13,7 @@ repositories { mavenLocal() // in case of local dataframe development } -application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.titanic.ml.TitanicKt") +application.mainClass = "org.jetbrains.kotlinx.dataframe.examples.titanic.ml.TitanicKt" dependencies { // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z") diff --git a/examples/idea-examples/youtube/build.gradle.kts b/examples/idea-examples/youtube/build.gradle.kts index 379cf1c63a..e8e19c44fa 100644 --- a/examples/idea-examples/youtube/build.gradle.kts +++ b/examples/idea-examples/youtube/build.gradle.kts @@ -15,7 +15,7 @@ repositories { mavenLocal() // in case of local dataframe development } -application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.youtube.YoutubeKt") +application.mainClass = "org.jetbrains.kotlinx.dataframe.examples.youtube.YoutubeKt" dependencies { // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z") diff --git a/plugins/expressions-converter/build.gradle.kts b/plugins/expressions-converter/build.gradle.kts index fae312e9ac..a74b035e4c 100644 --- a/plugins/expressions-converter/build.gradle.kts +++ b/plugins/expressions-converter/build.gradle.kts @@ -61,7 +61,7 @@ sourceSets { tasks.create("generateTests") { classpath = sourceSets.test.get().runtimeClasspath - mainClass.set("org.jetbrains.kotlinx.dataframe.GenerateTestsKt") + mainClass = "org.jetbrains.kotlinx.dataframe.GenerateTestsKt" } fun Test.setLibraryProperty(propName: String, jarName: String) { diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts index 6c21ce80a8..2f66887e8f 100644 --- a/plugins/kotlin-dataframe/build.gradle.kts +++ b/plugins/kotlin-dataframe/build.gradle.kts @@ -95,7 +95,7 @@ tasks.compileTestKotlin { tasks.create("generateTests") { classpath = sourceSets.test.get().runtimeClasspath - mainClass.set("org.jetbrains.kotlin.fir.dataframe.GenerateTestsKt") + mainClass = "org.jetbrains.kotlin.fir.dataframe.GenerateTestsKt" } fun Test.setLibraryProperty(propName: String, jarName: String) { @@ -109,11 +109,11 @@ fun Test.setLibraryProperty(propName: String, jarName: String) { } kotlinPublications { - fairDokkaJars.set(false) + fairDokkaJars = false publication { - publicationName.set("api") - artifactId.set("compiler-plugin-all") - description.set("Data processing in Kotlin") - packageName.set(artifactId) + publicationName = "api" + artifactId = "compiler-plugin-all" + description = "Data processing in Kotlin" + packageName = artifactId } } diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index 79478ce03e..b9a6c60e28 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -54,8 +54,8 @@ korro { groupSamples { - beforeSample.set("\n") - afterSample.set("\n") + beforeSample = "\n" + afterSample = "\n" funSuffix("_properties") { replaceText("NAME", "Properties") @@ -66,8 +66,8 @@ korro { funSuffix("_strings") { replaceText("NAME", "Strings") } - beforeGroup.set("\n") - afterGroup.set("") + beforeGroup = "\n" + afterGroup = "" } }