build: Additional build tweaks

kordamp · Jun 3, 2024 · 4695e8d · 4695e8d
1 parent ab34ff9
commit 4695e8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -65,7 +65,7 @@ jobs:
         run: echo ::set-output name=version::$(cat VERSION)
 
       - name: Release
-        uses: jreleaser/release-action@v1
+        uses: jreleaser/release-action@v2
         with:
           version: early-access
           arguments: release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,10 +59,11 @@ jobs:
           VERSION=${{ github.event.inputs.version }}
           echo $VERSION > VERSION
           git add VERSION
+          sed -i -e "s/^\:project-version\:\ .*/:project-version: ${{ needs.precheck.outputs.VERSION }}/g" README.adoc
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --global user.name "GitHub Action"
           git commit -a -m "Releasing version $VERSION"
-          git push origin main
+          git push origin master
 
       - name: Build
         run: |
@@ -80,7 +81,7 @@ jobs:
           build publishToSonatype closeAndReleaseSonatypeStagingRepository -S
 
       - name: Release
-        uses: jreleaser/release-action@v1
+        uses: jreleaser/release-action@v2
         with:
           version: early-access
           arguments: full-release

diff --git a/gradle.properties b/gradle.properties
@@ -29,6 +29,8 @@ ezmorphVersion             = 3.0.0
 jacocoVersion              = 0.8.6
 junitVersion               = 4.13.2
 slf4jVersion               = 1.7.32
+slf4jTestVersion           = 1.2.0
+xmlunitVersion             = 1.6
 xomVersion                 = 1.3.7
 
 kordampPluginVersion       = 0.46.0

diff --git a/subprojects/json-lib-core/json-lib-core.gradle b/subprojects/json-lib-core/json-lib-core.gradle
@@ -34,6 +34,6 @@ dependencies {
     api("xom:xom:$xomVersion")
     api("org.kordamp.ezmorph:ezmorph-core:$ezmorphVersion")
 
-    testImplementation('xmlunit:xmlunit:1.6')
-    testImplementation('uk.org.lidalia:slf4j-test:1.2.0')
+    testImplementation("xmlunit:xmlunit:$xmlunitVersion")
+    testImplementation("uk.org.lidalia:slf4j-test:$slf4jTestVersion")
 }