Merge pull request #70 from rundeck-plugins/update-gradle

update gradle

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
     - name: Get Release Version
       id: get_version
       run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
-    - name: Upload docker-container zip
+    - name: Upload docker zip
       uses: actions/[email protected]
       with:
         # Artifact name
-        name: docker-container-${{ steps.get_version.outputs.VERSION }}
+        name: docker-${{ steps.get_version.outputs.VERSION }}
         # Directory containing files to upload
-        path: ./build/libs/docker-container-${{ steps.get_version.outputs.VERSION }}.zip
+        path: ./build/libs/docker-${{ steps.get_version.outputs.VERSION }}.zip

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./build/libs/docker-container-${{ steps.get_version.outputs.VERSION }}.zip
-          asset_name: docker-container-${{ steps.get_version.outputs.VERSION }}.zip
+          asset_path: ./build/libs/docker-${{ steps.get_version.outputs.VERSION }}.zip
+          asset_name: docker-${{ steps.get_version.outputs.VERSION }}.zip
           asset_content_type: application/zip
 

build.gradle

@@ -4,19 +4,19 @@ buildscript {
     }
 }
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.11.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.13.4'
 }
 
 ext.pluginName = 'Docker Plugin'
 ext.pluginDescription = "Docker manager plugin"
 ext.sopsCopyright = "© 2022, Rundeck, Inc."
 ext.sopsUrl = "http://rundeck.com"
 ext.buildDateString=new Date().format("yyyy-MM-dd'T'HH:mm:ssX")
-ext.archivesBaseName = "docker-container"
+ext.archivesBaseName = "docker"
 ext.pluginBaseFolder = "."
 
 scmVersion {
-    ignoreUncommittedChanges = false
+    ignoreUncommittedChanges = true
     tag {
         prefix = ''
         versionSeparator = ''
@@ -35,4 +35,4 @@ scmVersion {
 project.version = scmVersion.version
 ext.archiveFilename = ext.archivesBaseName + '-' + version
 
-apply from: 'https://raw.githubusercontent.com/rundeck-plugins/build-zip/master/build.gradle'
+apply from: 'https://raw.githubusercontent.com/rundeck-plugins/build-zip/gradle-5.6/build.gradle'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists