Use Gradle 7.6 to build Gradle plugin #13860
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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}" publishPluginMavenPublicationToSonatypeRepository closeAndReleaseRepository; | ||
| echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseRepository"; | ||
| popd; | ||
| elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then | ||
| echo "Publishing from branch $TRAVIS_BRANCH"; | ||
| mvn clean deploy --settings CI/settings.xml; | ||
| echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; | ||
| pushd .; | ||
| cd modules/openapi-generator-gradle-plugin; | ||
| ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToSonatypeRepository closeAndReleaseRepository; | ||
| echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseRepository"; | ||
| 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; | ||
|
There was a problem hiding this comment. @erichaagdev we're working on v6.3.0 release but Travis CI shows the following errors: Do you know what may have caused this? There was a problem hiding this comment. Travis CI job full log: https://app.travis-ci.com/github/OpenAPITools/openapi-generator/jobs/594874885 |
||
| echo "Finished ./gradlew publishPlugins (plugin portal)"; | ||
| popd; | ||
| fi; | ||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,56 @@ | ||
| import io.github.gradlenexus.publishplugin.CloseNexusStagingRepository | ||
| import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository | ||
| import org.jetbrains.kotlin.gradle.tasks.KotlinCompile | ||
|
|
||
| plugins { | ||
| id("com.gradle.plugin-publish") version "1.0.0" | ||
| id("io.github.gradle-nexus.publish-plugin") version "1.1.0" | ||
| id("java-gradle-plugin") | ||
| id("maven-publish") | ||
| id("org.gradle.kotlin.kotlin-dsl") version "2.4.1" | ||
| id("org.jetbrains.kotlin.jvm") version "1.7.10" | ||
| id("signing") | ||
| } | ||
|
|
||
| group = "org.openapitools" | ||
| version = "$openApiGeneratorVersion" | ||
| ext.isReleaseVersion = !version.endsWith("SNAPSHOT") | ||
|
|
||
| description = """ | ||
| This plugin supports common functionality found in Open API Generator CLI as a Gradle plugin. | ||
|
|
||
| This gives you the ability to generate client SDKs, documentation, new generators, and to validate Open API 2.0 and 3.x | ||
| specifications as part of your build. Other tasks are available as command line tasks. | ||
| """ | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
| withJavadocJar() | ||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
| } | ||
|
|
||
| repositories { | ||
wing328 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| mavenCentral() | ||
| maven { | ||
| name = "Sonatype Snapshots" | ||
| url "https://oss.sonatype.org/content/repositories/snapshots/" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("org.openapitools:openapi-generator:$openApiGeneratorVersion") | ||
| testImplementation("org.jetbrains.kotlin:kotlin-test-testng:1.7.10") | ||
| } | ||
|
|
||
| tasks.named("test", Test).configure { | ||
| useTestNG() | ||
| testLogging.showStandardStreams = false | ||
|
|
||
| beforeTest { descriptor -> | ||
| logger.lifecycle("Running test: " + descriptor) | ||
| } | ||
|
|
||
| onOutput { descriptor, event -> | ||
| // SLF4J may complain about multiple bindings depending on how this is run. | ||
| // This is just a warning, but can make test output less readable. So we ignore it specifically. | ||
|
|
@@ -88,133 +60,105 @@ test { | |
| } | ||
| } | ||
|
|
||
| tasks.withType(KotlinCompile).configureEach { | ||
| kotlinOptions { | ||
| jvmTarget = "1.8" | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(Javadoc).configureEach { | ||
| if (JavaVersion.current().isJava9Compatible()) { | ||
| options.addBooleanOption("html5", true) | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(CloseNexusStagingRepository).configureEach { | ||
| onlyIf { nexusPublishing.useStaging.get() } | ||
| } | ||
|
|
||
| tasks.withType(ReleaseNexusStagingRepository).configureEach { | ||
| onlyIf { nexusPublishing.useStaging.get() } | ||
| } | ||
|
|
||
| gradlePlugin { | ||
| website = "https://openapi-generator.tech/" | ||
| vcsUrl = "https://github.com/OpenAPITools/openapi-generator" | ||
| plugins { | ||
| openApiGenerator { | ||
| id = "org.openapi.generator" | ||
| description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)." | ||
| displayName = "OpenAPI Generator Gradle Plugin" | ||
| implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin" | ||
| tags.addAll("openapi-3.0", "openapi-2.0", "openapi", "swagger", "codegen", "sdk") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| nexusPublishing { | ||
| repositories { | ||
| sonatype { | ||
| username = project.properties["ossrhUsername"] | ||
| password = project.properties["ossrhPassword"] | ||
|
|
||
| // To retrieve: ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="$SIGNING_SECRET" getStagingProfile | ||
| stagingProfileId = "456297f829bbbe" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Signing requires three keys to be defined: signing.keyId, signing.password, and signing.secretKeyRingFile. | ||
| // These can be passed to the Gradle command: | ||
| // ./gradlew -Psigning.keyId=yourid | ||
| // or stored as key=value pairs in ~/.gradle/gradle.properties | ||
| // You can also apply them in CI via environment variables. See Gradle's docs for details. | ||
| signing { | ||
| required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") } | ||
| sign(publishing.publications) | ||
| } | ||
|
|
||
| // afterEvaluate is necessary because java-gradle-plugin | ||
| // creates its publications in an afterEvaluate callback | ||
| afterEvaluate { | ||
| tasks.named("publishToSonatype").configure { | ||
| dependsOn("check") | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| pluginMaven { | ||
| pom { | ||
| name = "OpenAPI-Generator Contributors" | ||
| description = project.description | ||
| url = "https://openapi-generator.tech" | ||
| organization { | ||
| name = "org.openapitools" | ||
| url = "https://github.com/OpenAPITools" | ||
| } | ||
| licenses { | ||
| license { | ||
| name = "The Apache Software License, Version 2.0" | ||
| url = "https://www.apache.org/licenses/LICENSE-2.0.txt" | ||
| distribution = "repo" | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id = "openapitools" | ||
| name = "OpenAPI-Generator Contributors" | ||
| email = "[email protected]" | ||
| } | ||
| } | ||
| scm { | ||
| url = "https://github.com/OpenAPITools/openapi-generator" | ||
| connection = "scm:git:git://github.com/OpenAPITools/openapi-generator.git" | ||
| developerConnection = "scm:git:ssh://[email protected]:OpenAPITools/openapi-generator.git" | ||
| } | ||
| issueManagement { | ||
| system = "GitHub" | ||
| url = "https://github.com/OpenAPITools/openapi-generator/issues" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could not figure out why previously the
publishMavenJavaPublicationToNexusRepositorytask was called in the firstifcondition, but thepublishPluginMavenPublicationToNexusRepositorytask was called in the second. I came to the conclusion this was probably not intentional.In any case, there is no longer a
mavenJavapublication sopublishPluginMavenPublicationToSonatypeRepositoryis called in both places.