diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd286f8..73b975d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,9 +26,9 @@ jobs: fail-fast: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4.0.0 with: distribution: zulu java-version: ${{ matrix.java_version }} @@ -40,6 +40,6 @@ jobs: sudo apt-get -qq update && sudo apt-get -qq install libatlas3-base - - uses: gradle/gradle-build-action@v2 + - uses: gradle/gradle-build-action@v2.11.1 with: arguments: build --warning-mode all diff --git a/CHANGELOG.md b/CHANGELOG.md index cfb7861..f1d890a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,16 @@ Gradle MaryTTS Kaldi MFA Plugin [Unreleased] ------------ +### Fixed + +- Replaced dead repo for JTok dependency + ### Changed +- Build with Gradle v7.6.3 +- Upgraded GitHub actions +- Upgraded dependencies +- Upgraded plugins - [all changes since v0.4.0] [v0.4.0] (2023-01-16) diff --git a/build.gradle b/build.gradle index f12f130..57d40c0 100644 --- a/build.gradle +++ b/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' } @@ -7,20 +7,17 @@ group 'de.dfki.mary' version '0.5.0-SNAPSHOT' description 'Forced alignment based on MaryTTS, Kaldi, and MFA' -pluginBundle { +gradlePlugin { def pluginUrl = 'https://github.com/marytts/gradle-marytts-kaldi-mfa-plugin' website = pluginUrl vcsUrl = pluginUrl - description = project.description - tags = ['text-to-speech', 'kaldi', 'marytts', 'forced-alignment'] -} - -gradlePlugin { plugins { maryttsKaldiMfaPlugin { id = 'de.dfki.mary.voicebuilding.marytts-kaldi-mfa' implementationClass = 'de.dfki.mary.voicebuilding.MaryttsKaldiMfaPlugin' displayName = 'Gradle MaryTTS Kaldi MFA plugin' + description = project.description + tags.set(['text-to-speech', 'kaldi', 'marytts', 'forced-alignment']) } } } @@ -31,7 +28,7 @@ repositories { dependencies { 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.5.1' } java { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..afba109 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..b1624c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/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 diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/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% diff --git a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy index 5f46545..73df09e 100644 --- a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy +++ b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy @@ -23,7 +23,7 @@ class MaryttsKaldiMfaPlugin implements Plugin { exclusiveContent { forRepository { maven { - url 'https://mlt.jfrog.io/artifactory/mlt-mvn-releases-local' + url 'https://raw.githubusercontent.com/DFKI-MLT/Maven-Repository/main' } } filter {