From 5ca7b958b1b6cc63daf215d05ae4da2dab67a269 Mon Sep 17 00:00:00 2001 From: airsquared <36649395+airsquared@users.noreply.github.com> Date: Sun, 24 Sep 2023 18:32:45 -0700 Subject: [PATCH] Release v3.0.0 --- .github/workflows/publish-plugin.yml | 25 ++++++++++++------------- build.gradle | 3 +-- gradle.properties | 8 ++++---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml index 3cbbb06c..01adc789 100644 --- a/.github/workflows/publish-plugin.yml +++ b/.github/workflows/publish-plugin.yml @@ -5,19 +5,18 @@ on: [workflow_dispatch] jobs: publish: runs-on: ubuntu-latest - env: - GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} - GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} steps: - - name: Git checkout - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - cache: gradle - distribution: temurin - java-version: 17 - - name: Create gradle.properties - run: echo -e "gradle.publish.key=$GRADLE_PUBLISH_KEY\ngradle.publish.secret=$GRADLE_PUBLISH_SECRET" > gradle.properties - - name: Build with Gradle - run: ./gradlew build -x test publishPlugins + java-version: '17' + distribution: 'zulu' + - name: Publish Gradle Plugins + uses: gradle/gradle-build-action@v2 + with: + arguments: | + build + publishPlugins + -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} + -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }} diff --git a/build.gradle b/build.gradle index 4718e370..af8856a5 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ project.version.with { major = pluginVersionMajor as int minor = pluginVersionMinor as int patch = pluginVersionPatch as int - if (hasProperty('pluginVersionLabel')) { + if (project.hasProperty('pluginVersionLabel')) { preRelease = pluginVersionLabel } releaseBuild = pluginReleaseBuild @@ -75,7 +75,6 @@ shadowJar { gradlePlugin { website = vcsUrl = 'https://github.com/beryx/badass-jlink-plugin' - plugins { jlink { id = 'org.beryx.jlink' diff --git a/gradle.properties b/gradle.properties index 33490b14..5c44d889 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -pluginVersionMajor = 2 -pluginVersionMinor = 27 +pluginVersionMajor = 3 +pluginVersionMinor = 0 pluginVersionPatch = 0 -# pluginVersionLabel = rc-1 -pluginReleaseBuild = false +pluginVersionLabel = rc-1 +pluginReleaseBuild = true