diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c0ea71b..09716f7 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,12 +10,17 @@ on: - major - minor - patch - default: "patch" + snapshot: + description: "Is Snapshot" + required: false + type: boolean + default: true jobs: publish: - name: Publish Snapshot to Maven Central + name: Publish to Maven Central uses: entur/gha-maven-central/.github/workflows/gradle-publish.yml@v1 with: next_version: ${{ inputs.next_version }} + snapshot: ${{ inputs.snapshot }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/publishSnapshot.yaml b/.github/workflows/publishSnapshot.yaml deleted file mode 100644 index 829ff11..0000000 --- a/.github/workflows/publishSnapshot.yaml +++ /dev/null @@ -1,11 +0,0 @@ -name: Publish Snapshot to Sonatype -on: - workflow_dispatch: - -jobs: - publish: - name: Publish Snapshot to Maven Central - uses: entur/gha-maven-central/.github/workflows/gradle-publish.yml@v1 - with: - snapshot: true - secrets: inherit \ No newline at end of file diff --git a/README.md b/README.md index 09f5977..7c53ba4 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,9 @@ Run tests: ./gradlew test ``` +Releases are done using the publish.yaml workflow. +Do not bump the version in gradle.properties manually! + ## Contributing Contributions are welcome! See [CONTRIBUTING](/CONTRIBUTING.md) for details. diff --git a/build.gradle b/build.gradle index d8ccdc5..1c50cc3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,15 @@ +buildscript { + configurations.classpath { + resolutionStrategy { + // Fix https://github.com/jreleaser/jreleaser/issues/1643 + force 'org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r' + } + } +} + plugins { id 'base' - id 'org.jreleaser' version "1.21.0" + id 'org.jreleaser' version "1.24.0" id 'com.github.ben-manes.versions' version '0.53.0' apply false id "com.github.spotbugs" version "6.4.5" apply false id 'com.diffplug.spotless' version "8.1.0" apply false