Update dependencies and clean up build scripts #423

FenstonSingel · 2024-08-09T02:23:16Z

Quick summary:

Gradle 8.9
Kotlin 2.0.10
cleanup of deprecated API and outdated issue workarounds
(re)organization and (re)structuring of build scripts' code
Gradle version catalog
cleaner configuration code for builds as a Kotlin user project

Rationale is a slightly better DX when working with a version catalog (which is to be introduced in a later commit). Usages of Property API now leverage the assignment Kotlin compiler plugin instead of invoking `set` methods directly. Usages of deprecated Gradle API are either replaced with supported alternatives or removed due to not really doing anything.

KGP now uses the `.kotlin` folder for purposes that it previously used the `.gradle` folder for; so the `.kotlin` folder is now excluded from the Git repository as well. Kotlin-related Gradle properties from `gradle.properties` are cleaned up and actualized: * `kotlin.js.compiler` is removed * `kotlin.native.ignoreIncorrectDependencies` is prepared for its deprecation in 2.0.20 * `kotlin.wasm.stability.nowarn` is temporarily added until its deprecation in 2.0.20 Usages of deprecated `kotlinOptions` API are migrated to supported `compilerOptions` API (see KT-57292 for more details). (Application of `-version` to Kotlin compilation tasks is just removed altogether; applying it only to K/JVM tasks seems questionable, and applying it to K/N tasks stops them from actually compiling anything.) Usages of all experimental KGP API now opt into said API. Usages of all outdated KGP API are removed. An error suppression warning (see KT-61129 for more details) is disabled due to a high number of hits throughout the repository. A usage of deprecated `kotlin.native.ThreadLocal` annotation is migrated to supported `kotlin.native.concurrent.ThreadLocal` annotation. Workarounds for the following issues are removed from the repository's build scripts: * node.js not supporting "the latest Wasm" * node.js not supporting Wasm GC milestone 4 * KT-58303

It will be reintroduced in a later commit.

There are three potentially important changes in this commit: * a workaround for Bintray publishing is removed because of, to quote a gradle.git#11412 commentator, "JFrog [electing] to shut down JCenter and Bintray rather than fix the problem" * `:kotlinx-datetime:compileCommonJsMainKotlinMetadata` task is enabled back to preserve compilation correctness (see KT-66382 for more details) * `:benchmarks` module's `jmh` source set is now also compiled during repository-wide builds (so that it's covered during builds as a Kotlin user project) Other than that, this commit is a bundle of minor, mostly structural tweaks for the sake of easier understanding and maintainability.

FenstonSingel · 2024-08-09T15:31:41Z

It makes sense to wait until #366 is merged into the master branch so that changes in build scripts from that PR could also be accounted for in this PR.

ilya-g

I believe we're going to merge #366 first because it's already ready and is just waiting until we finish the version 0.6.1 and start developing 0.7.0 in master.
This branch will likely introduce many conflicts if merged before that.

ilya-g · 2024-08-15T01:31:43Z

core/build.gradle.kts

                    target("linuxArm64")
-                    // Tier 4 (deprecated, but still in demand)
+                    // Deprecated


Please retain the comment that it is still in demand

ilya-g · 2024-08-15T01:32:30Z

core/build.gradle.kts

    }

-    js {
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {


Why wasmJs was moved higher? It's the most recent target amongst all, so we put it last by convention

ilya-g · 2024-08-15T01:36:32Z

core/build.gradle.kts

        }
    }
 }

-tasks {


What's wrong with using tasks dsl block to avoid repetitive tasks. prefix?

ilya-g · 2024-08-15T01:46:22Z

settings.gradle.kts

        mavenCentral()
        gradlePluginPortal()
+        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven")


We have put it first to ensure that infra plugin is obtained only from there.

Goooler · 2024-08-18T05:52:14Z

benchmarks/build.gradle.kts

    }
 }

-// Publish benchmarks to the root for the easier 'java -jar benchmarks.jar`
+// publish benchmarks to the repository root for easier `java -jar benchmarks.jar`
 tasks.named<Jar>("jmhJar") {


Suggested change

tasks.named<Jar>("jmhJar") {

tasks.jmhJar {

Goooler · 2024-08-18T05:53:03Z

benchmarks/build.gradle.kts

-repositories {
-    mavenCentral()
+// compile all Kotlin code from the module during full-repository builds
+tasks.named("assemble") {


Suggested change

tasks.named("assemble") {

tasks.assemble {

Goooler · 2024-08-18T05:54:18Z

benchmarks/build.gradle.kts


 plugins {
-    id("kotlin")
-    id("me.champeau.jmh")
+    with(libs.plugins) {


Prefer not using with to keep things as simple as possible in plugins.

Goooler · 2024-08-18T05:55:00Z

benchmarks/build.gradle.kts

+    tasks.withType<KotlinCompilationTask<*>>().forEach { compileKotlinTask ->
+        dependsOn(compileKotlinTask)


Suggested change

tasks.withType<KotlinCompilationTask<*>>().forEach { compileKotlinTask ->

dependsOn(compileKotlinTask)

dependsOn(tasks.withType<KotlinCompilationTask<*>>())

Goooler · 2024-08-18T06:00:16Z

core/build.gradle.kts

+        freeCompilerArgs.add("-Xexpect-actual-classes")
+        freeCompilerArgs.add("-Xdont-warn-on-error-suppression")


Suggested change

freeCompilerArgs.add("-Xexpect-actual-classes")

freeCompilerArgs.add("-Xdont-warn-on-error-suppression")

freeCompilerArgs.addAll(

"-Xexpect-actual-classes",

"-Xdont-warn-on-error-suppression",

)

Goooler · 2024-08-18T06:00:57Z

core/build.gradle.kts

-    jvm {
-        attributes {
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
+    targets.withType<KotlinNativeTarget> {


Suggested change

targets.withType<KotlinNativeTarget> {

targets.withType<KotlinNativeTarget>().configureEach {

Goooler · 2024-08-18T06:02:17Z

core/build.gradle.kts

@@ -322,7 +295,7 @@ val downloadWindowsZonesMapping by tasks.registering {
    val output = "$projectDir/windows/src/internal/WindowsZoneNames.kt"
    outputs.file(output)
    doLast {
-        val initialFileContents = try { File(output).readBytes() } catch(e: Throwable) { ByteArray(0) }
+        val initialFileContents = try { File(output).readBytes() } catch(_: Throwable) { ByteArray(0) }


Can be replaced by runCatching.

Goooler · 2024-08-18T06:03:51Z

gradle/wrapper/gradle-wrapper.properties

+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip


Suggested change

distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab

distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a

distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

FenstonSingel added 6 commits August 9, 2024 03:13

Remove old infrastructure for builds as a Kotlin user project

e2c0d4e

It will be reintroduced in a later commit.

Introduce a Gradle version catalog

5898535

Introduce new infrastructure for builds as a Kotlin user project

94fce17

FenstonSingel requested review from ilya-g and dkhalanskyjb and removed request for ilya-g and dkhalanskyjb August 9, 2024 02:24

ilya-g reviewed Aug 15, 2024

View reviewed changes

Goooler reviewed Aug 18, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies and clean up build scripts #423

Update dependencies and clean up build scripts #423

FenstonSingel commented Aug 9, 2024

FenstonSingel commented Aug 9, 2024 •

edited

Loading

ilya-g left a comment

ilya-g Aug 15, 2024

ilya-g Aug 15, 2024

ilya-g Aug 15, 2024

ilya-g Aug 15, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

Goooler Aug 18, 2024

                       }
                   }
               }
-              tasks {

		tasks.withType<KotlinCompilationTask<*>>().forEach { compileKotlinTask ->
		dependsOn(compileKotlinTask)

	tasks.withType<KotlinCompilationTask<*>>().forEach { compileKotlinTask ->
	dependsOn(compileKotlinTask)
	dependsOn(tasks.withType<KotlinCompilationTask<*>>())

		freeCompilerArgs.add("-Xexpect-actual-classes")
		freeCompilerArgs.add("-Xdont-warn-on-error-suppression")

-        freeCompilerArgs.add("-Xexpect-actual-classes")
-        freeCompilerArgs.add("-Xdont-warn-on-error-suppression")
+        freeCompilerArgs.addAll(
+            "-Xexpect-actual-classes",
+            "-Xdont-warn-on-error-suppression",
+        )

	targets.withType<KotlinNativeTarget> {
	targets.withType<KotlinNativeTarget>().configureEach {

		distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
		distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

Update dependencies and clean up build scripts #423

Are you sure you want to change the base?

Update dependencies and clean up build scripts #423

Conversation

FenstonSingel commented Aug 9, 2024

FenstonSingel commented Aug 9, 2024 • edited Loading

ilya-g left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FenstonSingel commented Aug 9, 2024 •

edited

Loading