Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to jdeb 1.10 #18

Merged
merged 5 commits into from
Apr 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 20
16 changes: 12 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,27 @@ on:
jobs:
publish:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
cache: 'gradle'
- name: build publish
run: ./gradlew clean build publish -x validatePomFileForPluginMavenPublication -x publishPluginMavenPublicationToGitHubPackagesRepository --no-daemon --info --stacktrace
timeout-minutes: 10
run: ./gradlew clean build publish -x validatePomFileForPluginMavenPublication -x publishPluginMavenPublicationToGitHubPackagesRepository --info --stacktrace
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}
- name: Publish Test Report
if: ${{ always() }}
uses: scacap/action-surefire-report@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
report_paths: '**/build/test-results/test/TEST-*.xml'
...
18 changes: 12 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,29 @@ jobs:
ci-build:
strategy:
matrix:
# os: [ ubuntu-latest ]
# os: [ ubuntu-latest, windows-latest ]
os: [ ubuntu-latest, windows-latest, macos-latest ]
java: [ 8 ]
# java: [ 8, 11, 14 ]
# java: [ 8, 11, 17 ]
runs-on: ${{ matrix.os }}
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'gradle'
- name: java version
run: java -version
- name: clean build
run: ./gradlew clean build -x validatePomFileForPluginMavenPublication --no-daemon --info --stacktrace
timeout-minutes: 10
- name: Publish Test Report
if: ${{ always() }}
uses: scacap/action-surefire-report@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
report_paths: '**/build/test-results/test/TEST-*.xml'
...
16 changes: 12 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,33 @@ on:
jobs:
release:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
cache: 'gradle'
- name: Set artifact version
run: |
echo "RELEASE_VERSION=$(echo '${{ github.event.release.tag_name }}' | sed -e s/^v//)" >> $GITHUB_ENV
- name: build publish
run: ./gradlew -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}" clean build publish publishPlugins closeAndReleaseStagingRepository -x validatePomFileForPluginMavenPublication -x publishPluginMavenPublicationToGitHubPackagesRepository -x publishPluginMavenPublicationToSonatypeRepository --no-daemon --info --stacktrace -Pversion="${{ env.RELEASE_VERSION }}"
timeout-minutes: 10
run: ./gradlew -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}" clean build publish publishPlugins closeAndReleaseStagingRepository -x validatePomFileForPluginMavenPublication -x publishPluginMavenPublicationToGitHubPackagesRepository -x publishPluginMavenPublicationToSonatypeRepository --info --stacktrace -Pversion="${{ env.RELEASE_VERSION }}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
- name: Publish Test Report
if: ${{ always() }}
uses: scacap/action-surefire-report@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
report_paths: '**/build/test-results/test/TEST-*.xml'
...
4 changes: 2 additions & 2 deletions .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Update Gradle Wrapper

on:
workflow_dispatch:
workflow_dispatch:
schedule:
# "weekly" https://crontab.guru/every-week
- cron: "0 0 * * 0"
Expand All @@ -10,7 +10,7 @@ jobs:
update-gradle-wrapper:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v1
with:
Expand Down
24 changes: 13 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@ plugins {
id("java-gradle-plugin")
id("maven-publish")
id("signing")
id("com.github.ben-manes.versions") version "0.38.0"
id("com.github.ben-manes.versions") version "0.42.0"
id("net.ossindex.audit") version "0.4.11"
id("com.gradle.plugin-publish") version "0.14.0"
id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
id("com.gradle.plugin-publish") version "0.21.0"
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
// TODO Validation fails for the java-gradle-plugin "PluginMaven" publication
// Validation is disabled in the ci/cd workflows (`-x validatePomFileForPluginMavenPublication`)
id("io.freefair.maven-central.validate-poms") version "5.3.0"
id("io.freefair.maven-central.validate-poms") version "6.4.2"
}

val dependencyVersions = listOf(
"com.google.guava:guava:20.0",
"commons-io:commons-io:2.6",
"org.codehaus.plexus:plexus-classworlds:2.6.0",
"org.apache.maven:maven-artifact:3.6.0",
"org.apache.maven:maven-core:3.6.0",
"org.apache.maven:maven-model:3.6.0",
"org.apache.maven.shared:maven-shared-utils:3.3.3",
"org.codehaus.plexus:plexus-component-annotations:1.7.1",
"org.codehaus.plexus:plexus-utils:3.2.0"
"org.codehaus.plexus:plexus-interpolation:1.26",
"org.codehaus.plexus:plexus-utils:3.3.0"
)

repositories {
Expand All @@ -38,10 +40,10 @@ dependencies {
api(gradleApi())
api(localGroovy())

api("org.vafer:jdeb:1.5")
api("org.vafer:jdeb:1.10")
implementation("commons-lang:commons-lang:2.6")

testImplementation("org.spockframework:spock-core:1.3-groovy-2.5")
testImplementation("org.spockframework:spock-core:2.1-groovy-3.0")
testImplementation("cglib:cglib-nodep:3.3.0")

// see https://docs.gradle.org/current/userguide/test_kit.html
Expand All @@ -55,7 +57,7 @@ java {

tasks {
withType(Test::class.java) {
useJUnit()
useJUnitPlatform()
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading