Update to Gradle 8 #122

aSemy · 2023-03-01T10:18:08Z

bump Gradle Plugin Publish Plugin version
build script updates & improvements
use Java Toolchains to set Java version
use jvm-test-fixtures plugin for functionalTest sources

This PR contains no functional changes to the library or plugin.

Things to test

Is the plugin still published as expected? All the artifacts should be the same.
Is the Maven metadata correct?
Is the Gradle metadata still correct? The Java version?

- bump Gradle Plugin Publish Plugin version - build script updates & improvements - use Java Toolchains to set Java version - use jvm-test-fixtures plugin for functionalTest sources

build.gradle.kts

qwwdfsad · 2023-03-13T16:23:19Z

build.gradle.kts

    doLast {
-        outputDir.mkdirs()
-        file(outputDir.resolve("plugin-classpath.txt")).writeText(testPluginRuntimeConfiguration.get().joinToString("\n"))
+        file(outputDir.resolve("plugin-classpath.txt")).writeText(testPluginRuntimeConfiguration.joinToString("\n"))


This one seems to be the really nasty hack from the earlier Gradle era where there were no proper test kits. Could you please check if it's still needed?

I'm happy to do so, but I thought it would be a bit of a larger change than just bumping the Gradle version. It would require updating the test code to remove the addPluginTestRuntimeClasspath() helper function.

Additionally, it seems like this hack is hardcoding the Kotlin version to be 1.8.10, even though the test data specify Kotlin 1.3

binary-compatibility-validator/src/functionalTest/resources/examples/gradle/base/withPlugin.gradle.kts

Line 7 in 5d08f51

kotlin("jvm") version "1.3.70"

So when I remove the hack, the Config Cache checks fail. Not because BCV is incompatible with CC, but because Kotlin 1.3 is incompatible.

I can update all of the test data to use Kotlin 1.8.10?

(btw, the replacement for this hack is this line: ~~gradlePlugin.testSourceSets(functionalTest.sources)~~ withPluginClasspath())

It would be totally okay, thanks!

I'd say it's even more preferable to have testdata being built with fresh Kotlin

build.gradle.kts

qwwdfsad · 2023-03-13T16:53:33Z

Thanks!

Is the plugin still published as expected? All the artifacts should be the same.

It is not, as I fail to execute ./gradlew publishToMavenLocal -- it now unconditionally requires PGP signature for local publication and testing. None of the developers [usually] have that, it would be nice to preserve the previous behaviour.

The corresponding error:

* What went wrong:
Execution failed for task ':signBinary-compatibility-validatorPluginMarkerMavenPublication'.
> Cannot perform signing task ':signBinary-compatibility-validatorPluginMarkerMavenPublication' because it has no configured signatory

aSemy · 2023-03-14T09:26:51Z

gradle.properties


 kotlinVersion=1.8.10
-pluginPublishVersion=0.10.1
+pluginPublishVersion=1.1.0


Note to self: Bumping this version was required to be compatible with Gradle 8, but it probably caused the signing requirement.

qwwdfsad · 2023-03-21T17:24:01Z

I confirmed that local publication works and that publishing works without breaking Sonatype invariants (e.g. it's releasable as is). Consumption of locally published (to mavenLocal) works as well, thanks!

It's already good to go, it's up to you whether you want to get rid of plugin-classpath.txt or proceed with other changes

aSemy · 2023-03-21T22:36:26Z

I confirmed that local publication works and that publishing works without breaking Sonatype invariants (e.g. it's releasable as is). Consumption of locally published (to mavenLocal) works as well, thanks!

It's already good to go, it's up to you whether you want to get rid of plugin-classpath.txt or proceed with other changes

Great! Thanks for checking. I think this can be merged.

I tried replacing plugin-classpath.txt with the newer withPluginClasspath() Gradle TestKit helper, but it did not work. There were errors in the Kotlin Multiplatform test projects. What I think is happening is that the testRuntime classpath contains a version of the Kotlin plugin or library or Gradle API that clashes and overrides some JAR, the result being that BCV throws a 'class not found' error for the KotlinProjectExtension class. It was weird.

The solution would be to instead publish BCV to a local Maven directory (not necessarily Maven Local). I can do that in a separate PR.

So yes, go ahead and merge please!

qwwdfsad

👍

- bump Gradle Plugin Publish Plugin version - build script updates & improvements - use Java Toolchains to set the Java version - use jvm-test-fixtures plugin for functionalTest sources - update build config, remove redundant Maven publication

* Annotate file paths with `@Language("file-reference")` (#126) * Update to Gradle 8 (#122) * bump Gradle Plugin Publish Plugin version * build script updates & improvements * use Java Toolchains to set the Java version * use jvm-test-fixtures plugin for functionalTest sources * update build config, remove redundant Maven publication * Initial Gradle convention plugins (#123) * Apply BCV, commit API dump (#131) * The ABI shape will be reduced in the future, this is a technical change * java-diff-utils * Update Gradle to 8.5 --------- Co-authored-by: aSemy <897017+aSemy@users.noreply.github.com>

Update to Gradle 8

eabdac2

- bump Gradle Plugin Publish Plugin version - build script updates & improvements - use Java Toolchains to set Java version - use jvm-test-fixtures plugin for functionalTest sources

This was referenced Mar 1, 2023

Initial Gradle convention plugins #123

Merged

Split signature-generator and Gradle plugin into separate projects #124

Closed

Apply kotlin-dsl plugin #125

Closed

aSemy changed the base branch from master to bcv-gradle-rework March 3, 2023 13:48

qwwdfsad self-requested a review March 3, 2023 13:52

Merge branch 'bcv-gradle-rework' into update/gradle8

358b7c9

qwwdfsad reviewed Mar 13, 2023

View reviewed changes

revert uncommenting of AGP

915e586

aSemy commented Mar 14, 2023

View reviewed changes

aSemy added 3 commits March 17, 2023 14:00

update resolves

f030b20

update Gradle to 8.0.2

2c8e687

update build config, remove redundant Maven publication

e87fe8e

qwwdfsad self-requested a review March 22, 2023 10:11

qwwdfsad approved these changes Mar 22, 2023

View reviewed changes

qwwdfsad merged commit b5e0510 into Kotlin:bcv-gradle-rework Mar 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update to Gradle 8 #122

Update to Gradle 8 #122

Uh oh!

aSemy commented Mar 1, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

qwwdfsad Mar 13, 2023

Uh oh!

aSemy Mar 13, 2023 •

edited

Loading

Uh oh!

qwwdfsad Mar 14, 2023 •

edited

Loading

Uh oh!

Uh oh!

qwwdfsad commented Mar 13, 2023

Uh oh!

aSemy Mar 14, 2023

Uh oh!

qwwdfsad commented Mar 21, 2023

Uh oh!

aSemy commented Mar 21, 2023

Uh oh!

qwwdfsad left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Update to Gradle 8 #122

Update to Gradle 8 #122

Uh oh!

Conversation

aSemy commented Mar 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

qwwdfsad Mar 13, 2023

Choose a reason for hiding this comment

Uh oh!

aSemy Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qwwdfsad Mar 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

qwwdfsad commented Mar 13, 2023

Uh oh!

aSemy Mar 14, 2023

Choose a reason for hiding this comment

Uh oh!

qwwdfsad commented Mar 21, 2023

Uh oh!

aSemy commented Mar 21, 2023

Uh oh!

qwwdfsad left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

aSemy commented Mar 1, 2023 •

edited

Loading

aSemy Mar 13, 2023 •

edited

Loading

qwwdfsad Mar 14, 2023 •

edited

Loading