-
Notifications
You must be signed in to change notification settings - Fork 5k
Upgrade embedded Kotlin to 1.7.10 #21032
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6bd5173
to
6616ad8
Compare
13 tasks
bot-gradle
added a commit
that referenced
this pull request
Jun 22, 2022
As a preparation for #21032 Along the way: * upgrade smoke tested `ktlint-gradle` version * upgrade `ktlint` usage in `:quickCheck` and mark that task as not compatible with configuration caching ### Context <!--- Why do you believe many users will benefit from this change? --> <!--- Link to relevant issues or forum discussions here --> ### Contributor Checklist - [ ] [Review Contribution Guidelines](https://github.com/gradle/gradle/blob/master/CONTRIBUTING.md) - [ ] Make sure that all commits are [signed off](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) to indicate that you agree to the terms of [Developer Certificate of Origin](https://developercertificate.org/). - [ ] Make sure all contributed code can be distributed under the terms of the [Apache License 2.0](https://github.com/gradle/gradle/blob/master/LICENSE), e.g. the code was written by yourself or the original code is licensed under [a license compatible to Apache License 2.0](https://apache.org/legal/resolved.html). - [ ] Check ["Allow edit from maintainers" option](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) in pull request so that additional changes can be pushed by Gradle team - [ ] Provide integration tests (under `<subproject>/src/integTest`) to verify changes from a user perspective - [ ] Provide unit tests (under `<subproject>/src/test`) to verify logic - [ ] Update User Guide, DSL Reference, and Javadoc for public-facing changes - [ ] Ensure that tests pass sanity check: `./gradlew sanityCheck` - [ ] Ensure that tests pass locally: `./gradlew <changed-subproject>:quickTest` ### Gradle Core Team Checklist - [ ] Verify design and implementation - [ ] Verify test coverage and CI build status - [ ] Verify documentation - [ ] Recognize contributor in release notes Co-authored-by: Paul Merlin <[email protected]>
4df8af7
to
c9b519e
Compare
c2be7b2
to
eb5443a
Compare
7e27cff
to
b86c430
Compare
f1923de
to
358d157
Compare
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
For the upgrade to Kotlin 1.7 Signed-off-by: Paul Merlin <[email protected]>
for next development iteration Signed-off-by: Paul Merlin <[email protected]>
The `toolchain-kotlin` sample was broken because `kotlinOptions.jdkHome` has been deprecated for a while and removed in Kotlin 1.7.0. Introduce a new sample that doesn't rely on third party plugins and adjust the documentation chapter. Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
The underlying issue is fixed since Kotlin 1.5.31 and now causes problems with Kotlin 1.7.x Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
Signed-off-by: Paul Merlin <[email protected]>
358d157
to
d2d2540
Compare
@bot-gradle test APT |
OK, I've already triggered the following builds for you: |
@bot-gradle test and merge |
OK, I've already triggered a build for you. |
This was referenced Jul 19, 2022
You can give it a try with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While keeping target api/language to 1.4 for backwards compatibility.
Found issues:
Internal Kotlin compiler API now requires JDK_HOME to be setInternal Kotlin compiler API now requires JDK roots to be explicitely set to work on Java >= 18ktlint-convention
plugin needs an upgradeUpgrade ktlint-convention plugin to 0.8.0 #21066JVM toolchain documentation snippet to set tool on community plugin task needs to be changed asKotlinCompile.kotlinOptions.jdkHome
has been deprecated and removedErrors resolving KGP variantssamples/build-organization/structuring-software-projects
is broken by KGP variant resolution errorsUpgrading in build init plugin causes KGP variant resolution errors inbuildSrc
Blocked on https://youtrack.jetbrains.com/issue/KT-52987/Allow-to-disable-adding-orgjetbrainskotlinplatformtype-attribute-to-outgoing-variants which means we need to wait for Kotlin 1.7.10New sample rendered for review:
https://builds.gradle.org/repository/download/Gradle_Master_Check_BuildDistributions/53841869:id/distributions/gradle-7.6-docs.zip!/gradle-7.6-20220713055324%2B0000/docs/userguide/toolchains.html#integration_with_tasks_relying_on_a_java_executable_or_java_home
Follow ups to be done in subsequent PR(s)
Update the wrapper and remove branching inbuild-logic-commons/gradle-plugin/build.gradle.kts
Update wrapper to latest nightly #21286
Reviewkotlin-compiler-embeddable
patchingUse the vanilla
kotlin-compiler-embeddable
#21298