Use Gradle 7.6 to build Gradle plugin #13860

erichaagdev · 2022-10-30T00:17:02Z

This PR updates the openapi-generator-gradle-plugin project to build with Gradle 7.6, the latest.

All plugin versions have been updated to their latest versions. The plugins io.codearte.nexus-staging and de.marcphilipp.nexus-publish have been replaced by io.github.gradle-nexus.publish-plugin as recommended by the original plugin authors. Aside from the configuration, the only notable difference is that "Nexus" has been replaced with "Sonatype" in the names of the relevant publish tasks.

I'm not sure why previously there existed both a mavenJava and pluginMaven publication. For a Gradle plugin, the only publication needed is pluginMaven created by the java-gradle-plugin plugin. I've removed the mavenJava publication. Only pluginMaven is published to Sonatype.

I am unable to test publishing to Sonatype. However, I compared the before and after output of publishToMavenLocal and saw no notable differences.

I did not update the sample project as it does not depend on the version of Gradle used to build the plugin itself. I also did not want to make this PR any larger.

Gradle Build Scan: https://gradle.com/s/d4jzctozh7gem
Gradle 7.6 Release Notes: https://docs.gradle.org/7.6/release-notes.html

PR checklist

Read the contribution guidelines.
Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
Run the following to build the project and update samples:
```
./mvnw clean package 
./bin/generate-samples.sh
./bin/utils/export_docs_generators.sh
```
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
For Windows users, please run the script in Git BASH.
File the PR against the correct branch: master (6.1.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

erichaagdev · 2022-10-30T00:28:03Z

.travis.yml

@@ -160,24 +160,24 @@ after_success:
        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
-        echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
+        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToSonatypeRepository closeAndReleaseRepository;


I could not figure out why previously the publishMavenJavaPublicationToNexusRepository task was called in the first if condition, but the publishPluginMavenPublicationToNexusRepository task was called in the second. I came to the conclusion this was probably not intentional.

In any case, there is no longer a mavenJava publication so publishPluginMavenPublicationToSonatypeRepository is called in both places.

erichaagdev · 2022-10-30T00:39:00Z

@wing328 could you please review this PR? Thank you!

erichaagdev · 2022-10-30T00:40:24Z

@sorin-florea I'd be honored to have you review this PR as well. 😄

erichaagdev · 2022-10-30T01:35:17Z

@saschpe a review from you would be appreciated too.

erichaagdev · 2022-11-05T16:15:25Z

@cbornet @jmini @etherealjoy @spacether could I get a review? Thank you!

wing328 · 2022-11-08T03:34:21Z

@erichaagdev thanks for the PR. Can you please PM me via Slack for a few quick questions when you've time?

wing328 · 2022-11-30T02:56:08Z

shippable.yml

-    - unzip -d /opt/gradle gradle-5.6.4-bin.zip
-    - export PATH=/opt/gradle/gradle-5.6.4/bin:$PATH 
+    - unzip -d /opt/gradle gradle-7.6-bin.zip
+    - export PATH=/opt/gradle/gradle-7.6/bin:$PATH
    - gradle -v
    - java -version
    # ensure all modifications created by 'mature' generators are in the git repo


FYI. thanks for updating it but we no longer use Shippable CI.

I'll file another PR to clean up this file later.

wing328 · 2022-11-30T02:57:40Z

CircleCI node 1 failure not related to this change.

modules/openapi-generator-gradle-plugin/build.gradle

wing328 · 2023-02-01T14:35:08Z

.travis.yml

        popd;
      fi;
      if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then
        echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET --no-daemon;
+        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET;


@erichaagdev we're working on v6.3.0 release but Travis CI shows the following errors:

For more details see https://docs.gradle.org/7.6/release-notes.html > Configure project : Signing plugin detected. Will automatically sign the published artifacts. > Task :pluginDescriptors UP-TO-DATE > Task :processResources UP-TO-DATE > Task :sourcesJar UP-TO-DATE > Task :generatePomFileForPluginMavenPublication > Task :generatePomFileForOpenApiGeneratorPluginMarkerMavenPublication > Task :signOpenApiGeneratorPluginMarkerMavenPublication FAILED > Task :compileKotlin w: /home/travis/build/OpenAPITools/openapi-generator/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt: (805, 48): 'getter for config: CodegenConfig!' is deprecated. Deprecated in Java w: /home/travis/build/OpenAPITools/openapi-generator/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt: (811, 40): 'getter for config: CodegenConfig!' is deprecated. Deprecated in Java FAILURE: Build failed with an exception. * What went wrong: Could not evaluate onlyIf predicate for task ':signOpenApiGeneratorPluginMarkerMavenPublication'. > Could not evaluate spec for 'Signing is required, or signatory is set'. * Try: > Run with --stacktrace option to get the stack trace. > Run with --info or --debug option to get more log output. > Run with --scan to get full insights. * Get more help at https://help.gradle.org Deprecated Gradle features were used in this build, making it incompatible with Gradle 8.0. You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins. See https://docs.gradle.org/7.6/userguide/command_line_interface.html#sec:command_line_warnings BUILD FAILED in 9s 7 actionable tasks: 4 executed, 3 up-to-date

Do you know what may have caused this?

Travis CI job full log: https://app.travis-ci.com/github/OpenAPITools/openapi-generator/jobs/594874885

erichaagdev requested a review from jimschubert as a code owner October 30, 2022 00:17

erichaagdev commented Oct 30, 2022

View reviewed changes

erichaagdev force-pushed the upgrade-gradle-7.5.1 branch from 0f424ec to 41ac01b Compare October 30, 2022 15:33

wing328 added Enhancement: Compatibility OpenAPI Generator Gradle Plugin labels Nov 8, 2022

wing328 added this to the 6.3.0 milestone Nov 8, 2022

sorin-florea approved these changes Nov 10, 2022

View reviewed changes

erichaagdev added 9 commits November 26, 2022 09:12

Upgrade Gradle plugin Gradle build to Gradle 7.5.1

631c9a1

Update Travis workflow file to support new tasks

53fe746

Update Maven POM with Gradle 7.5.1

8bdef7d

Capitalize many occurrences of "Gradle" in the Gradle plugin README

5350fb9

Update Gradle version in appveyor.yml and shippable.yml

6fc3f36

Update comments

ae84c6a

Update Gradle wrapper to 7.5.1

58f9602

Capitalize Gradle in shippable.yml

55f8812

Leave Open API

a1bd14a

erichaagdev force-pushed the upgrade-gradle-7.5.1 branch from 41ac01b to a1bd14a Compare November 26, 2022 15:12

erichaagdev changed the title ~~Use Gradle 7.5.1 to build Gradle plugin~~ Use Gradle 7.6 to build Gradle plugin Nov 26, 2022

Upgrade Gradle plugin build to Gradle 7.6

927818d

erichaagdev force-pushed the upgrade-gradle-7.5.1 branch 4 times, most recently from 9815ee5 to 927818d Compare November 26, 2022 16:48

Upgrade wrapper to Gradle 7.6

06e96ce

wing328 reviewed Nov 30, 2022

View reviewed changes

wing328 merged commit 792d44d into OpenAPITools:master Nov 30, 2022

erichaagdev deleted the upgrade-gradle-7.5.1 branch November 30, 2022 13:50

erichaagdev mentioned this pull request Nov 30, 2022

Fix Gradle plugin publishing #14150

Merged

5 tasks

wing328 reviewed Dec 15, 2022

View reviewed changes

modules/openapi-generator-gradle-plugin/build.gradle Show resolved Hide resolved

wing328 reviewed Feb 1, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Gradle 7.6 to build Gradle plugin #13860

Use Gradle 7.6 to build Gradle plugin #13860

erichaagdev commented Oct 30, 2022 •

edited

Loading

erichaagdev Oct 30, 2022

erichaagdev commented Oct 30, 2022

erichaagdev commented Oct 30, 2022

erichaagdev commented Oct 30, 2022

erichaagdev commented Nov 5, 2022

wing328 commented Nov 8, 2022

wing328 Nov 30, 2022

wing328 commented Nov 30, 2022

wing328 Feb 1, 2023

wing328 Feb 1, 2023

Use Gradle 7.6 to build Gradle plugin #13860

Use Gradle 7.6 to build Gradle plugin #13860

Conversation

erichaagdev commented Oct 30, 2022 • edited Loading

PR checklist

erichaagdev Oct 30, 2022

Choose a reason for hiding this comment

erichaagdev commented Oct 30, 2022

erichaagdev commented Oct 30, 2022

erichaagdev commented Oct 30, 2022

erichaagdev commented Nov 5, 2022

wing328 commented Nov 8, 2022

wing328 Nov 30, 2022

Choose a reason for hiding this comment

wing328 commented Nov 30, 2022

wing328 Feb 1, 2023

Choose a reason for hiding this comment

wing328 Feb 1, 2023

Choose a reason for hiding this comment

erichaagdev commented Oct 30, 2022 •

edited

Loading