Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from kotlinOptions to compilerOptions #2746

Merged
merged 11 commits into from
Aug 23, 2024
Merged

Migrate from kotlinOptions to compilerOptions #2746

merged 11 commits into from
Aug 23, 2024

Conversation

qwwdfsad
Copy link
Collaborator

No description provided.

@qwwdfsad qwwdfsad marked this pull request as ready for review July 18, 2024 13:34
@qwwdfsad
Copy link
Collaborator Author

@sandwwraith PTAL while Sergey is on vacation

Copy link
Member

@sandwwraith sandwwraith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title says '..in benchmarks module', but you actually migrated to compilerOptions everywhere, right?

}
}
jvmToolchain(jdkToolchainVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't here before, why is it needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In master (2.0.20), KGP requires toolchain and and jvmTarget to be consistent. Otherwise, things like org.gradle.api.InvalidUserCodeException: Inconsistent JVM-target compatibility detected for tasks 'compileTestJava' (1.8) and 'compileTestKotlin' (11). pop up

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, given that we have both options.release = 8 in JavaCompile and freeCompilerArgs.add("-Xjdk-release=1.8") in KotlinCompile, do we actually need toolchains?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you've added jdkToolchainVersion as a property, this block on line 21:

java {
    toolchain {
        languageVersion.set(JavaLanguageVersion.of(11))
    }
}

probably should use it as well instead of JavaLanguageVersion.of(11)

benchmark/build.gradle.kts Outdated Show resolved Hide resolved
formats/hocon/build.gradle.kts Outdated Show resolved Hide resolved
guide/build.gradle.kts Outdated Show resolved Hide resolved
qwwdfsad and others added 3 commits August 21, 2024 15:10
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
@qwwdfsad qwwdfsad changed the title Migrate from kotlinOptions to compilerOptions in benchmarks module Migrate from kotlinOptions to compilerOptions Aug 21, 2024
Copy link
Member

@sandwwraith sandwwraith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my replies under existing comment

@qwwdfsad qwwdfsad merged commit 35a9edc into dev Aug 23, 2024
4 checks passed
@qwwdfsad qwwdfsad deleted the kotlin-options branch August 23, 2024 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants