Merge pull request #846 from Kotlin/gradle-bump

Gradle bump to 8.10 and housekeeping
Kotlin · Sep 2, 2024 · fa70ab2 · fa70ab2
2 parents fdec9a1 + 5be47cb
commit fa70ab2
Show file tree

Hide file tree

Showing 18 changed files with 108 additions and 95 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import com.github.gmazzo.buildconfig.BuildConfigExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.dataframe.AnyFrame
@@ -133,8 +134,8 @@ kotlin.jvmToolchain(11)
 
 allprojects {
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
         }
     }
 
@@ -222,7 +223,7 @@ subprojects {
 }
 
 kotlinPublications {
-    fairDokkaJars.set(false)
+    fairDokkaJars = false
 
     sonatypeSettings(
         project.findProperty("kds.sonatype.user") as String?,
@@ -238,7 +239,7 @@ kotlinPublications {
 
     pom {
         githubRepo("Kotlin", "dataframe")
-        inceptionYear.set("2021")
+        inceptionYear = "2021"
         licenses {
             apache2()
         }
@@ -252,10 +253,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
@@ -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> {
@@ -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)
@@ -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")
@@ -317,8 +317,8 @@ korro {
         funSuffix("_strings") {
             replaceText("NAME", "Strings")
         }
-        beforeGroup.set("<tabs>\n")
-        afterGroup.set("</tabs>")
+        beforeGroup = "<tabs>\n"
+        afterGroup = "</tabs>"
     }
 }
 
@@ -366,19 +366,18 @@ tasks.withType<JavaCompile> {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn")
+    compilerOptions {
+        optIn.addAll("kotlin.RequiresOptIn")
+        freeCompilerArgs.addAll("-Xinline-classes")
     }
 }
 
 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 +388,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
@@ -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
@@ -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
@@ -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
@@ -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/json/build.gradle.kts b/examples/idea-examples/json/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.dataframe.api.JsonPath
 
@@ -22,7 +23,7 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
 
 dataframes {

diff --git a/examples/idea-examples/movies/build.gradle.kts b/examples/idea-examples/movies/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -15,13 +16,13 @@ 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")
     implementation(project(":"))
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
diff --git a/examples/idea-examples/titanic/build.gradle.kts b/examples/idea-examples/titanic/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     application
     kotlin("jvm")
@@ -13,7 +15,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")
@@ -35,7 +37,7 @@ dataframes {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
 }
 
 tasks.withType<JavaCompile> {

diff --git a/examples/idea-examples/youtube/build.gradle.kts b/examples/idea-examples/youtube/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -15,7 +16,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")
@@ -24,6 +25,6 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
 
diff --git 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-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/dataframe-gradle-plugin/build.gradle.kts b/plugins/dataframe-gradle-plugin/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
@@ -86,7 +88,7 @@ gradlePlugin {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
 
 tasks.withType<JavaCompile>().all {

diff --git a/...ins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt b/...ins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt
@@ -8,7 +8,6 @@ import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.provider.Provider
 import org.gradle.build.event.BuildEventsListenerRegistry
 import org.gradle.internal.service.DefaultServiceRegistry
-import org.gradle.internal.service.scopes.ProjectScopeServices
 import org.gradle.testfixtures.ProjectBuilder
 import org.gradle.tooling.events.OperationCompletionListener
 import java.lang.reflect.Field
@@ -26,8 +25,8 @@ internal fun makeProject(): ProjectInternal {
  */
 internal fun addBuildEventsListenerRegistryMock(project: Project) {
     try {
-        val projectScopeServices = (project as DefaultProject).services as ProjectScopeServices
-        val state: Field = ProjectScopeServices::class.java.superclass.getDeclaredField("state")
+        val projectScopeServices = (project as DefaultProject).services as DefaultServiceRegistry
+        val state: Field = DefaultServiceRegistry::class.java.getDeclaredField("state")
         state.isAccessible = true
         @Suppress("UNCHECKED_CAST")
         val stateValue: AtomicReference<Any> = state.get(projectScopeServices) as AtomicReference<Any>

diff --git a/plugins/expressions-converter/build.gradle.kts b/plugins/expressions-converter/build.gradle.kts
@@ -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) {