Skip to content

Commit

Permalink
Update gradle (7.6 -> 8.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakzal committed Feb 17, 2023
1 parent 4383cc6 commit 50f4305
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ jobs:
include:
- gradle-version: '6.5.1'
kotlin-version: '1.3.72'
- gradle-version: '6.8.3'
- gradle-version: '6.9.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'
kotlin-version: '1.7.20'
- gradle-version: '7.6'
kotlin-version: '1.7.20'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 3 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=SNAPSHOT
kotlinVersion=1.7.20
kotlinVersion=1.8.10
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand All @@ -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"'
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%

Expand Down

0 comments on commit 50f4305

Please sign in to comment.