Merge pull request #26 from asciidoctor/update-gradle

Upgrade gradle and asciidoctor-diagram to 2.2.3

Author: robertpanzer

.github/workflows/ci.yml

@@ -1,25 +1,34 @@
 name: CI
-on: [push, pull_request]
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
 jobs:
   test:
     strategy:
       matrix:
-        java: ['1.8', '11', '16']
+        java: ['8', '11', '17']
         os: [ubuntu-latest, macos-latest, windows-latest]
         exclude:
           - os: macos-latest
-            java: '1.8'
+            java: '8'
           - os: macos-latest
-            java: '16'
+            java: '17'
           - os: windows-latest
-            java: '1.8'
+            java: '8'
           - os: windows-latest
-            java: '16'
+            java: '17'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Build
         run: |

asciidoctorj-diagram-ditaamini/gradle.properties

@@ -1,4 +1,4 @@
 properName=AsciidoctorJ Diagram Ditaamini
 description=AsciidoctorJ Diagram Ditaamini bundles the Asciidoctor Diagram Ditaamini RubyGem (asciidoctor-diagram-ditaamini) so it can be loaded into the JVM using JRuby.
-version=1.0.1
+version=1.0.3
 gem_name=asciidoctor-diagram-ditaamini

asciidoctorj-diagram-plantuml/gradle.properties

@@ -1,5 +1,5 @@
 properName=AsciidoctorJ Diagram Plantuml
 description=AsciidoctorJ Diagram Plantul bundles the Asciidoctor Diagram Plantuml RubyGem (asciidoctor-diagram-plantuml) so it can be loaded into the JVM using JRuby.
-version=1.2021.8
+version=1.2022.5
 gem_name=asciidoctor-diagram-plantuml
 

asciidoctorj-diagram/gradle.properties

@@ -1,4 +1,4 @@
 properName=AsciidoctorJ Diagram
 description=AsciidoctorJ Diagram bundles the Asciidoctor Diagram RubyGem (asciidoctor-diagram) so it can be loaded into the JVM using JRuby.
-version=2.2.1
+version=2.2.3
 gem_name=asciidoctor-diagram

build.gradle

@@ -17,24 +17,10 @@ buildscript {
 // modern plugins config
 plugins {
   id "signing"
-  id "io.codearte.nexus-staging" version "0.22.0"
-  id "de.marcphilipp.nexus-publish" version "0.4.0"
+  id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
   id 'com.github.jruby-gradle.base' version '2.0.0'
 }
 
-apply plugin: 'io.codearte.nexus-staging'
-
-
-nexusStaging {
-  if (project.hasProperty("sonatypeUsername")) {
-    username = project.sonatypeUsername
-  }
-  if (project.hasProperty("sonatypePassword")) {
-    password = project.sonatypePassword
-  }
-  repositoryDescription = "Release ${project.group} ${project.version}"
-}
-
 // TIP use -PpublishRelease=true to active release behavior regardless of the version
 status = project.hasProperty('publishRelease') && project.publishRelease.toBoolean() ?
     'release' : ((version == 'unspecified' || version.endsWith('-SNAPSHOT')) ? 'snapshot' : 'release')
@@ -187,3 +173,18 @@ configure(subprojects.findAll { it.name != 'itest'}) {
   processResources.dependsOn jrubyPrepare
 
 }
+
+nexusPublishing {
+  repositories {
+    sonatype {
+      if (project.hasProperty("sonatypeUsername")) {
+        username = project.sonatypeUsername
+      }
+      if (project.hasProperty("sonatypePassword")) {
+        password = project.sonatypePassword
+      }
+      repositoryDescription = "Release ${project.group} ${project.version}"
+    }
+  }
+  clientTimeout = Duration.ofMinutes(5)
+}

gradle.properties

@@ -1,2 +1,2 @@
-version=2.2.1
+version=2.2.3
 gem_name=asciidoctor-diagram

gradle/publish.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'de.marcphilipp.nexus-publish'
+apply plugin: 'maven-publish'
 
 publishing {
     publications.create(project.ext.publicationName, MavenPublication) {
@@ -85,9 +85,3 @@ publishing {
         }
     }
 }
-
-nexusPublishing {
-    repositories {
-        sonatype()
-    }
-}

gradle/wrapper/gradle-wrapper.jar

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