diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2804e12..05555c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,15 +17,7 @@ jobs: gradle-version: [ 'current' ] kotlin-version: [ '' ] include: - - gradle-version: '6.5.1' - kotlin-version: '1.3.72' - - gradle-version: '6.8.3' - kotlin-version: '1.4.32' - - gradle-version: '7.1.1' - kotlin-version: '1.4.32' - - gradle-version: '7.2' - kotlin-version: '1.5.30' - - gradle-version: '7.5.1' + - gradle-version: '7.6' kotlin-version: '1.7.20' runs-on: ubuntu-latest steps: diff --git a/build.gradle.kts b/build.gradle.kts index 47f5fc6..9cf6ad9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,22 +40,19 @@ dependencies { } gradlePlugin { + website.set("https://github.com/jakzal/gradle-structurizr-cli") + vcsUrl.set("https://github.com/jakzal/gradle-structurizr-cli.git") plugins { create("structurizrCli") { id = "pl.zalas.structurizr-cli" displayName = "Gradle Structurizr CLI plugin" implementationClass = "pl.zalas.gradle.structurizrcli.StructurizrCliPlugin" description = "Enables Gradle to run Structurizr CLI commands." + tags.set(listOf("structurizr", "structurizr-cli", "task", "diagrams", "diagrams-as-code", "plantuml", "mermaid", "websequencediagrams", "json")) } } } -pluginBundle { - website = "https://github.com/jakzal/gradle-structurizr-cli" - vcsUrl = "https://github.com/jakzal/gradle-structurizr-cli.git" - tags = listOf("structurizr", "structurizr-cli", "task", "diagrams", "diagrams-as-code", "plantuml", "mermaid", "websequencediagrams", "json") -} - val functionalTestSourceSet = sourceSets.create("functionalTest") { } diff --git a/gradle.properties b/gradle.properties index 3351a6a..7ef8c76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=SNAPSHOT -kotlinVersion=1.7.20 +kotlinVersion=1.8.10 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 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 070cb70..42defcc 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-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%