Skip to content

Conversation

eskatos
Copy link
Member

@eskatos eskatos commented 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

Contributor Checklist

  • Review Contribution Guidelines
  • Make sure that all commits are signed off to indicate that you agree to the terms of Developer Certificate of Origin.
  • Make sure all contributed code can be distributed under the terms of the Apache License 2.0, e.g. the code was written by yourself or the original code is licensed under a license compatible to Apache License 2.0.
  • Check "Allow edit from maintainers" option 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

@eskatos eskatos added the in:building-gradle gradle/gradle build label Jun 22, 2022
@eskatos eskatos added this to the 7.6 RC1 milestone Jun 22, 2022
@eskatos eskatos self-assigned this Jun 22, 2022
@eskatos eskatos mentioned this pull request Jun 22, 2022
5 tasks
@eskatos
Copy link
Member Author

eskatos commented Jun 22, 2022

@bot-gradle test this

@bot-gradle
Copy link
Collaborator

OK, I've already triggered the following builds for you:

@eskatos eskatos marked this pull request as ready for review June 22, 2022 12:44

ktlint {
version.set("0.41.0")
}
Copy link
Member Author

Choose a reason for hiding this comment

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

This is not needed anymore as we can now use the default version

@eskatos
Copy link
Member Author

eskatos commented Jun 22, 2022

@bot-gradle test and merge

@gradle gradle deleted a comment from eskatos Jun 22, 2022
@bot-gradle
Copy link
Collaborator

OK, I've already triggered a build for you.

@bot-gradle bot-gradle merged commit 07daec1 into master Jun 22, 2022
@blindpirate blindpirate deleted the eskatos/ktlint/upgrade branch June 23, 2022 02:28
bot-gradle added a commit that referenced this pull request Jul 19, 2022
While keeping target api/language to 1.4 for backwards compatibility.

Found issues:
* [x] ~Internal Kotlin compiler API now requires JDK_HOME to be set~
* [x] ~Internal Kotlin compiler API now requires JDK roots to be explicitely set to work on Java >= 18~
* [x] ~`ktlint-convention` plugin needs an upgrade~
  ~#21066
* [x] ~JVM toolchain documentation snippet to set tool on community plugin task needs to be changed as `KotlinCompile.kotlinOptions.jdkHome` has been deprecated and removed~
* [x] ~Errors resolving KGP variants~
  * ~`samples/build-organization/structuring-software-projects` is broken by KGP variant resolution errors~
  * ~Upgrading in build init plugin causes KGP variant resolution errors in `buildSrc`~
  * ~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.10**~

----

New 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 in `build-logic-commons/gradle-plugin/build.gradle.kts`
* Review `kotlin-compiler-embeddable` patching

Co-authored-by: Paul Merlin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in:building-gradle gradle/gradle build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants