Merge pull request #25 from psibre/upgrades

Upgrades

.github/workflows/main.yml

@@ -14,18 +14,16 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-        java: [ 8, 11, 17 ]
+        java: [ 11, 17 ]
         exclude:
-          - os: macos-latest
-            java: 8
           - os: macos-latest
             java: 17
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.6.0
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v3.12.0
         with:
           distribution: zulu
           java-version: ${{ matrix.java }}
@@ -41,6 +39,6 @@ jobs:
         run: |
           brew install flac sox
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: build --warning-mode all

CHANGELOG.md

@@ -4,8 +4,16 @@ Gradle FLAML Plugin
 [Unreleased]
 ------------
 
+### Removed
+
+- Testing on Java 8
+
 ### Changed
 
+- Build with Gradle v8.4
+- Upgraded GitHub actions
+- Upgraded dependencies
+- Upgraded plugins
 - [all changes since v0.4.0]
 
 [v0.4.0] - 2023-01-19

build.gradle

@@ -1,28 +1,27 @@
 plugins {
-    id 'com.gradle.plugin-publish' version '1.1.0'
+    id 'com.gradle.plugin-publish' version '1.2.1'
     id 'groovy'
     id 'io.github.m2ci-msp.praat-wrapper' version '0.7.0'
 }
 
 group 'org.m2ci.msp'
 version '0.5.0-SNAPSHOT'
 description 'Utility plugin to manage speech data following FLAC+YAML convention'
-ext.url = 'https://github.com/m2ci-msp/gradle-flaml-plugin'
-ext.isReleaseVersion = !version.endsWith('-SNAPSHOT')
-
-pluginBundle {
-    website = project.url
-    vcsUrl = project.url
-    description = project.description
-    tags = ['speech data', 'phonetics']
+ext {
+    url = 'https://github.com/m2ci-msp/gradle-flaml-plugin'
+    isReleaseVersion = !version.endsWith('-SNAPSHOT')
 }
 
 gradlePlugin {
+    website = project.url
+    vcsUrl = project.url
     plugins {
         flamlPlugin {
             id = 'org.m2ci.msp.flaml'
             implementationClass = 'org.m2ci.msp.flaml.FlamlPlugin'
             displayName = project.description
+            description = project.description
+            tags.set(['speech data', 'phonetics'])
         }
     }
 }
@@ -32,14 +31,14 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'de.undercouch', name: 'gradle-download-task', version: '5.3.0'
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.33'
+    implementation group: 'de.undercouch', name: 'gradle-download-task', version: '5.5.0'
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.2'
     implementation group: 'io.github.m2ci-msp', name: 'jtgt', version: '0.7.0'
-    testImplementation group: 'org.testng', name: 'testng', version: '7.5'
+    testImplementation group: 'org.testng', name: 'testng', version: '7.8.0'
 }
 
-task generateTestResources(type: Exec) {
-    dependsOn praat
+tasks.register('generateTestResources', Exec) {
+    dependsOn tasks.named('praat')
     def scriptFile = objects.fileProperty()
     def destDir = objects.directoryProperty()
     scriptFile.set file('src/test/praat/generateTestResources.praat')
@@ -69,7 +68,7 @@ test {
 
 publishing {
     publications {
-        withType(MavenPublication) {
+        withType(MavenPublication).configureEach {
             pom {
                 name = 'FLAML Plugin'
                 description = project.description

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%