From a968057c6f2614918288459cc75e21b2a20c7305 Mon Sep 17 00:00:00 2001 From: cjbrooks12 Date: Sat, 7 Aug 2021 22:25:31 -0500 Subject: [PATCH] Publishes orchid-maven-plugin to MavenCentral --- .../.mvn/wrapper/maven-wrapper.properties | 2 +- buildSrc/orchidMavenPlugin/deploy.sh | 4 +- buildSrc/orchidMavenPlugin/pom.xml | 89 ++++++++++++++++++- buildSrc/orchidMavenPlugin/settings.xml | 20 ++++- .../kotlin/copper-leaf-sonatype.gradle.kts | 15 ++++ deploy.sh | 4 +- 6 files changed, 123 insertions(+), 11 deletions(-) diff --git a/buildSrc/orchidMavenPlugin/.mvn/wrapper/maven-wrapper.properties b/buildSrc/orchidMavenPlugin/.mvn/wrapper/maven-wrapper.properties index 642d572ce9..ffdc10e59f 100644 --- a/buildSrc/orchidMavenPlugin/.mvn/wrapper/maven-wrapper.properties +++ b/buildSrc/orchidMavenPlugin/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/buildSrc/orchidMavenPlugin/deploy.sh b/buildSrc/orchidMavenPlugin/deploy.sh index 5cf916d354..9868d5d39c 100755 --- a/buildSrc/orchidMavenPlugin/deploy.sh +++ b/buildSrc/orchidMavenPlugin/deploy.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash set -e -./mvnw versions:set -DnewVersion=$GRADLE_PROJECT_RELEASE_NAME +export GPG_TTY=$(tty) + +./mvnw versions:set -DnewVersion=$projectVersion ./mvnw deploy -s settings.xml diff --git a/buildSrc/orchidMavenPlugin/pom.xml b/buildSrc/orchidMavenPlugin/pom.xml index f7b66b9450..b8f735f55f 100644 --- a/buildSrc/orchidMavenPlugin/pom.xml +++ b/buildSrc/orchidMavenPlugin/pom.xml @@ -2,11 +2,30 @@ 4.0.0 - io.github.javaeden.orchid + io.github.copper-leaf.orchid orchid-maven-plugin - 0.18.0 + 1.0.0 Orchid Maven plugin + A Maven plugin for building and running Orchid sites. + https://orchid.run + + + GPL-2.0 + https://opensource.org/licenses/GPL-3.0 + + + + + cjbrooks12 + Casey Brooks + cjbrooks12@gmail.com + + + + https://github.com/orchidhq/orchid.git + + maven-plugin @@ -50,13 +69,75 @@ + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://s01.oss.sonatype.org/ + true + false + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + - orchid-bintray - https://api.bintray.com/maven/javaeden/Orchid/${project.artifactId}/;publish=1;override=1 + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/buildSrc/orchidMavenPlugin/settings.xml b/buildSrc/orchidMavenPlugin/settings.xml index 8d1009e3da..92c0865fbe 100644 --- a/buildSrc/orchidMavenPlugin/settings.xml +++ b/buildSrc/orchidMavenPlugin/settings.xml @@ -1,9 +1,21 @@ - orchid-bintray - ${env.ORG_GRADLE_PROJECT_bintray_username} - ${env.ORG_GRADLE_PROJECT_bintray_apiKey} + ossrh + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} - \ No newline at end of file + + + ossrh + + true + + + ${env.SIGNING_KEY_ID} + ${env.SIGNING_PASSWORD} + + + + diff --git a/buildSrc/src/main/kotlin/copper-leaf-sonatype.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-sonatype.gradle.kts index 321c001f68..522bd07786 100644 --- a/buildSrc/src/main/kotlin/copper-leaf-sonatype.gradle.kts +++ b/buildSrc/src/main/kotlin/copper-leaf-sonatype.gradle.kts @@ -100,3 +100,18 @@ val closeSonatypeStagingRepository by tasks.registering { publishConfiguration.stagingRepositoryIdFile.delete() } } + +val writeProjectVersion by tasks.registering { + description = "Write the project version to a file" + doLast { + val file = project.rootProject.buildDir.resolve("export").resolve("projectVersion") + if(!file.parentFile.exists()) { + file.parentFile.mkdirs() + } + if(!file.exists()) { + file.createNewFile() + } + + file.writeText(Config.projectVersion(project).toString()) + } +} diff --git a/deploy.sh b/deploy.sh index 2442a663d6..a20f8e0909 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,9 +1,11 @@ #!/usr/bin/env bash set -e +./gradlew writeProjectVersion -Prelease +export projectVersion=`cat ./build/export/projectVersion` + # Build and deploy normal Gradle projects ./gradlew assemble publishToMavenLocal publish :docs:orchidDeploy -PorchidEnvironment=prod -Prelease -export GRADLE_PROJECT_RELEASE_NAME=$(./gradlew getReleaseName -Prelease --quiet) # Deploy Gradle plugin pushd buildSrc