Skip to content

Commit

Permalink
now all gradle versions are up-to-date, updating all .set() notations…
Browse files Browse the repository at this point in the history
… with = for better readability
  • Loading branch information
Jolanrensen committed Aug 27, 2024
1 parent 6f623c9 commit 231ed08
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 56 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ subprojects {
}

kotlinPublications {
fairDokkaJars.set(false)
fairDokkaJars = false

sonatypeSettings(
project.findProperty("kds.sonatype.user") as String?,
Expand All @@ -238,7 +238,7 @@ kotlinPublications {

pom {
githubRepo("Kotlin", "dataframe")
inceptionYear.set("2021")
inceptionYear = "2021"
licenses {
apache2()
}
Expand All @@ -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 {
Expand Down
38 changes: 18 additions & 20 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ val compileSamplesKotlin = tasks.named<KotlinCompile>("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<KspTask> {
Expand Down Expand Up @@ -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<JavaExec>("copySamplesOutputs") {
group = "documentation"
mainClass.set("org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt")
mainClass = "org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt"

dependsOn(clearSamplesOutputs)
dependsOn(samplesTest)
Expand Down Expand Up @@ -305,8 +305,8 @@ korro {

groupSamples {

beforeSample.set("<tab title=\"NAME\">\n")
afterSample.set("\n</tab>")
beforeSample = "<tab title=\"NAME\">\n"
afterSample = "\n</tab>"

funSuffix("_properties") {
replaceText("NAME", "Properties")
Expand All @@ -317,8 +317,8 @@ korro {
funSuffix("_strings") {
replaceText("NAME", "Strings")
}
beforeGroup.set("<tabs>\n")
afterGroup.set("</tabs>")
beforeGroup = "<tabs>\n"
afterGroup = "</tabs>"
}
}

Expand Down Expand Up @@ -366,19 +366,17 @@ tasks.withType<JavaCompile> {
}

tasks.withType<KotlinCompile> {
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",
)
}
}
Expand All @@ -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
}
}

Expand Down
8 changes: 4 additions & 4 deletions dataframe-arrow/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
8 changes: 4 additions & 4 deletions dataframe-excel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
8 changes: 4 additions & 4 deletions dataframe-jdbc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
8 changes: 4 additions & 4 deletions dataframe-openapi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/idea-examples/movies/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion examples/idea-examples/titanic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion examples/idea-examples/youtube/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion plugins/expressions-converter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sourceSets {

tasks.create<JavaExec>("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) {
Expand Down
12 changes: 6 additions & 6 deletions plugins/kotlin-dataframe/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ tasks.compileTestKotlin {

tasks.create<JavaExec>("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) {
Expand All @@ -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
}
}
8 changes: 4 additions & 4 deletions tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ korro {

groupSamples {

beforeSample.set("<tab title=\"NAME\">\n")
afterSample.set("\n</tab>")
beforeSample = "<tab title=\"NAME\">\n"
afterSample = "\n</tab>"

funSuffix("_properties") {
replaceText("NAME", "Properties")
Expand All @@ -66,8 +66,8 @@ korro {
funSuffix("_strings") {
replaceText("NAME", "Strings")
}
beforeGroup.set("<tabs>\n")
afterGroup.set("</tabs>")
beforeGroup = "<tabs>\n"
afterGroup = "</tabs>"
}
}

Expand Down

0 comments on commit 231ed08

Please sign in to comment.