Skip to content

Commit

Permalink
Feedback on plugin rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdaugherty
jdaugherty committed Dec 3, 2024
1 parent 5d2869e commit 765a019
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 41 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ or
developers = [johndoe: 'John Doe']
}

By default this plugin will publish to the specified `MAVEN_PUBLISH` instance for snapshots, and `NEXUS_PUBLISH` for releases. To change the snapshot publish behavior, set `snapshotRepoType` to `PublishType.NEXUS_PUBLISH`. To change the release publish behavior, set `releaseRepoType` to `PublishType.NEXUS_PUBLISH`.
By default, this plugin will publish to the specified `MAVEN_PUBLISH` instance for snapshots, and `NEXUS_PUBLISH` for releases. To change the snapshot publish behavior, set `snapshotRepoType` to `PublishType.NEXUS_PUBLISH`. To change the release publish behavior, set `releaseRepoType` to `PublishType.MAVEN_PUBLISH`.

The credentials and connection url must be specified as a project property or an environment variable.

Expand All @@ -83,10 +83,10 @@ The credentials and connection url must be specified as a project property or an

`NEXUS_PUBLISH` Environment Variables are:

NEXUS_PUBLISH_URL
NEXUS_PUBLISH_SNAPSHOT_URL
NEXUS_PUBLISH_USERNAME
NEXUS_PUBLISH_PASSWORD
NEXUS_PUBLISH_URL
NEXUS_PUBLISH_SNAPSHOT_URL
NEXUS_PUBLISH_STAGING_PROFILE_ID

grails-web
Expand Down
80 changes: 42 additions & 38 deletions src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ The credentials and connection url must be specified as a project property or an
MAVEN_PUBLISH_URL
`NEXUS_PUBLISH` Environment Variables are:
NEXUS_PUBLISH_URL
NEXUS_PUBLISH_SNAPSHOT_URL
NEXUS_PUBLISH_USERNAME
NEXUS_PUBLISH_PASSWORD
NEXUS_PUBLISH_URL
NEXUS_PUBLISH_SNAPSHOT_URL
NEXUS_PUBLISH_STAGING_PROFILE_ID
"""
}
Expand All @@ -111,20 +111,27 @@ The credentials and connection url must be specified as a project property or an
extraPropertiesExtension.setProperty(SIGNING_PASSWORD, project.findProperty(SIGNING_PASSWORD) ?: System.getenv('SIGNING_PASSPHRASE'))
extraPropertiesExtension.setProperty(SIGNING_KEYRING, project.findProperty(SIGNING_KEYRING) ?: System.getenv('SIGNING_KEYRING'))

project.afterEvaluate {
PublishType snapshotPublishType = gpe.snapshotPublishType
PublishType releasePublishType = gpe.releasePublishType

boolean isSnapshot = project.version.endsWith('SNAPSHOT')
boolean isRelease = !isSnapshot
PublishType snapshotPublishType = gpe.snapshotPublishType
PublishType releasePublishType = gpe.releasePublishType

boolean mavenPublish = (isSnapshot && snapshotPublishType == PublishType.MAVEN_PUBLISH) || (isRelease && releasePublishType == PublishType.MAVEN_PUBLISH)
boolean sonatypePublish = (isSnapshot && snapshotPublishType == PublishType.NEXUS_PUBLISH) || (isRelease && releasePublishType == PublishType.NEXUS_PUBLISH)
boolean isSnapshot = project.version.endsWith('SNAPSHOT')
boolean isRelease = !isSnapshot
boolean mavenPublish = (isSnapshot && snapshotPublishType == PublishType.MAVEN_PUBLISH) || (isRelease && releasePublishType == PublishType.MAVEN_PUBLISH)
boolean nexusPublish = (isSnapshot && snapshotPublishType == PublishType.NEXUS_PUBLISH) || (isRelease && releasePublishType == PublishType.NEXUS_PUBLISH)

final PluginManager projectPluginManager = project.getPluginManager()
final PluginManager rootProjectPluginManager = project.rootProject.getPluginManager()
projectPluginManager.apply(MavenPublishPlugin)
final PluginManager projectPluginManager = project.getPluginManager()
final PluginManager rootProjectPluginManager = project.rootProject.getPluginManager()

// Required for the pom always
projectPluginManager.apply(MavenPublishPlugin)

if(nexusPublish) {
rootProjectPluginManager.apply(NexusPublishPlugin)
projectPluginManager.apply(SigningPlugin)
}

project.afterEvaluate {
project.publishing {
if (mavenPublish) {
System.setProperty('org.gradle.internal.publish.checksums.insecure', true as String)
Expand All @@ -136,7 +143,7 @@ The credentials and connection url must be specified as a project property or an
}

if (!mavenPublishUrl) {
throw new RuntimeException('Could not locate a project property of `mavenPublishUrl` or an environment variable of `MAVEN_PUBLISH_URL`')
// throw new RuntimeException('Could not locate a project property of `mavenPublishUrl` or an environment variable of `MAVEN_PUBLISH_URL`')
}
url = mavenPublishUrl
}
Expand Down Expand Up @@ -172,32 +179,32 @@ The credentials and connection url must be specified as a project property or an
if (gpe != null) {
pomNode.children().last() + {
def title = gpe.title ?: project.name
delegate.name = title
delegate.description = gpe.desc ?: title
delegate.name title
delegate.description gpe.desc ?: title

def websiteUrl = gpe.websiteUrl ?: gpe.githubSlug ? "https://github.com/$gpe.githubSlug" : ''
if (!websiteUrl) {
throw new RuntimeException(getErrorMessage('websiteUrl'))
}
delegate.url = websiteUrl
delegate.url websiteUrl

def license = gpe.license
if (license != null) {
def concreteLicense = GrailsPublishExtension.License.LICENSES.get(license.name)
if (concreteLicense != null) {
delegate.licenses {
delegate.license {
delegate.name = concreteLicense.name
delegate.url = concreteLicense.url
delegate.distribution = concreteLicense.distribution
delegate.name concreteLicense.name
delegate.url concreteLicense.url
delegate.distribution concreteLicense.distribution
}
}
} else if (license.name && license.url) {
delegate.licenses {
delegate.license {
delegate.name = license.name
delegate.url = license.url
delegate.distribution = license.distribution
delegate.name license.name
delegate.url license.url
delegate.distribution license.distribution
}
}
}
Expand All @@ -207,29 +214,29 @@ The credentials and connection url must be specified as a project property or an

if (gpe.githubSlug) {
delegate.scm {
delegate.url = "https://github.com/$gpe.githubSlug"
delegate.connection = "scm:git@github.com:${gpe.githubSlug}.git"
delegate.developerConnection = "scm:git@github.com:${gpe.githubSlug}.git"
delegate.url "https://github.com/$gpe.githubSlug"
delegate.connection "scm:git@github.com:${gpe.githubSlug}.git"
delegate.developerConnection "scm:git@github.com:${gpe.githubSlug}.git"
}
delegate.issueManagement {
delegate.system = 'Github Issues'
delegate.url = "https://github.com/$gpe.githubSlug/issues"
delegate.system 'Github Issues'
delegate.url "https://github.com/$gpe.githubSlug/issues"
}
} else {
if (gpe.vcsUrl) {
delegate.scm {
delegate.url = gpe.vcsUrl
delegate.connection = "scm:$gpe.vcsUrl"
delegate.developerConnection = "scm:$gpe.vcsUrl"
delegate.url gpe.vcsUrl
delegate.connection "scm:$gpe.vcsUrl"
delegate.developerConnection "scm:$gpe.vcsUrl"
}
} else {
throw new RuntimeException(getErrorMessage('vcsUrl'))
}

if (gpe.issueTrackerUrl) {
delegate.issueManagement {
delegate.system = 'Issue Tracker'
delegate.url = gpe.issueTrackerUrl
delegate.system 'Issue Tracker'
delegate.url gpe.issueTrackerUrl
}
} else {
throw new RuntimeException(getErrorMessage('issueTrackerUrl'))
Expand All @@ -240,8 +247,8 @@ The credentials and connection url must be specified as a project property or an
delegate.developers {
for (entry in gpe.developers.entrySet()) {
delegate.developer {
delegate.id = entry.key
delegate.name = entry.value
delegate.id entry.key
delegate.name entry.value
}
}
}
Expand All @@ -266,10 +273,7 @@ The credentials and connection url must be specified as a project property or an
}
}

if (sonatypePublish) {
rootProjectPluginManager.apply(NexusPublishPlugin)
projectPluginManager.apply(SigningPlugin)

if (nexusPublish) {
extensionContainer.configure(SigningExtension, {
it.required = isRelease
it.sign project.publishing.publications.maven
Expand Down

0 comments on commit 765a019

Please sign in to comment.