Merge pull request #37 from psibre/upgrades

Upgrades

.github/workflows/main.yml

@@ -15,13 +15,13 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4.1.1
 
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3.13.0
  with:
  distribution: zulu
  java-version: ${{ matrix.java-version }}
 
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/gradle-build-action@v2.9.0
  with:
  arguments: build --warning-mode all

CHANGELOG.md

@@ -4,8 +4,16 @@ Gradle MaryTTS Component Plugin
 [Unreleased]
 ------------
 
+### Fixed
+
+- Replaced dead repo for JTok dependency
+
 ### Changed
 
+- Build with Gradle v7.6.4
+- Upgraded GitHub actions
+- Upgraded dependencies
+- Upgraded plugins
 - [all changes since v0.3.1]
 
 [v0.3.1] - 2023-01-22

build.gradle

@@ -1,5 +1,5 @@
 plugins {
- id 'com.gradle.plugin-publish' version '1.1.0'
+ id 'com.gradle.plugin-publish' version '1.2.1'
  id 'groovy'
  id 'jacoco'
  id 'signing'
@@ -10,20 +10,17 @@ version '0.4.0-SNAPSHOT'
 description 'Utility plugin to build MaryTTS components with Gradle'
 ext.isReleaseVersion = !version.endsWith('-SNAPSHOT')
 
-pluginBundle {
+gradlePlugin {
  def url = 'https:/marytts/gradle-marytts-component-plugin'
  website = url
  vcsUrl = url
- description = project.description
- tags = ['marytts', 'text-to-speech', 'tts', 'speech synthesis']
-}
-
-gradlePlugin {
  plugins {
  componentPlugin {
  id = 'de.dfki.mary.component'
  implementationClass = 'de.dfki.mary.ComponentPlugin'
  displayName = 'Gradle MaryTTS Component Plugin'
+ description = project.description
+ tags.set(['marytts', 'text-to-speech', 'tts', 'speech synthesis'])
  }
  }
 }
@@ -33,8 +30,8 @@ repositories {
 }
 
 dependencies {
- api group: 'org.yaml', name: 'snakeyaml', version: '1.33'
- testImplementation group: 'org.testng', name: 'testng', version: '7.5'
+ api group: 'org.yaml', name: 'snakeyaml', version: '2.2'
+ testImplementation group: 'org.testng', name: 'testng', version: '7.5.1'
 }
 
 java {
@@ -70,7 +67,7 @@ jacocoTestReport {
 
 publishing {
  publications {
- withType(MavenPublication) {
+ withType(MavenPublication).configureEach {
  pom {
  name = 'MaryTTS Component Plugin'
  description = project.description
@@ -114,6 +111,6 @@ publishing {
  }
 }
 
-tasks.withType(Sign) {
+tasks.withType(Sign).configureEach {
  onlyIf { isReleaseVersion }
 }

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.4-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:/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https:/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:/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%
 

src/main/groovy/de/dfki/mary/ComponentPlugin.groovy

@@ -32,7 +32,7 @@ class ComponentPlugin implements Plugin<Project> {
  forRepository {
  maven {
  name 'DFKI-MLT'
- url 'https://mlt.jfrog.io/artifactory/mlt-mvn-releases-local'
+ url 'https://raw.githubusercontent.com/DFKI-MLT/Maven-Repository/main'
  }
  }
  filter {
@@ -62,7 +62,7 @@ class ComponentPlugin implements Plugin<Project> {
  exclude group: 'gov.nist.math', module: 'Jampack'
  }
  testImplementation localGroovy()
- testImplementation group: 'org.testng', name: 'testng', version: '7.5'
+ testImplementation group: 'org.testng', name: 'testng', version: '7.5.1'
  }
 
  project.tasks.register('generateServiceLoader', GenerateServiceLoader) {