Skip to content

Commit f7380c1

Browse files
committed
chore: enable compact object header, multi dollar interpolation
1 parent aaf5170 commit f7380c1

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
191191
"-XX:+UseZGC",
192192
"-XX:+UseStringDeduplication",
193193
"-XX:+UnlockExperimentalVMOptions",
194+
"-XX:+UseCompactObjectHeaders",
194195
"-XX:MaxRAMPercentage=0.8",
195196
// "-XX:+UseEpsilonGC",
196197
// "-XX:+AlwaysPreTouch",
@@ -259,7 +260,6 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
259260
// "-XshowSettings:system",
260261
// "-XshowSettings:properties",
261262
// "--show-module-resolution",
262-
// "-XX:+UseCompactObjectHeaders",
263263
// "-XX:+ShowHiddenFrames",
264264
// "-verbose:module",
265265
// "-XX:ConcGCThreads=2",
@@ -396,6 +396,7 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
396396
freeCompilerArgs.addAll(
397397
"-Xexpect-actual-classes",
398398
"-Xskip-prerelease-check",
399+
"-Xmulti-dollar-interpolation",
399400
// "-XXLanguage:+ExplicitBackingFields",
400401
// "-Xsuppress-version-warnings",
401402
// "-P",
@@ -429,6 +430,7 @@ fun KspAATask.configureKspConfig() =
429430

430431
/**
431432
* JVM backend compiler options can be found in,
433+
* - [CommonCompilerArgs](https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt)
432434
* - [K2JVMCompilerArguments.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt)
433435
* - [JvmTarget.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt)
434436
* - [ApiVersion.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt#L35)

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ spotless {
9595
ktfmt(ktfmtVersion)
9696
target("src/**/*.kts", "src/**/*.kt")
9797
trimTrailingWhitespace()
98+
suppressLintsFor { step = "ktfmt" }
9899
// licenseHeader(rootProject.file("gradle/license-header.txt"))
99100
}
100101

gradle/build-logic/src/main/kotlin/tasks/MultiReleaseJar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private val Project.javaToolchains: JavaToolchainService
2626
*
2727
* For more details, check this [kotlinx-io](https://github.com/Kotlin/kotlinx-io/pull/406/files) PR
2828
*/
29-
public fun Project.configureJava9ModuleInfoCompilation(
29+
fun Project.configureJava9ModuleInfoCompilation(
3030
sourceSetName: String,
3131
toolchainVersion: JavaLanguageVersion,
3232
parentCompilation: KotlinJvmCompilation,

0 commit comments

Comments
 (0)