From b1c388e9b43a0f99b7e5543628863df80f2efd42 Mon Sep 17 00:00:00 2001 From: Nik Clayton Date: Sat, 3 Feb 2024 15:05:43 +0100 Subject: [PATCH] chore(deps): update dependency gradle to v8.6 (#411) Use new simple property assignment syntax in build files where appropriate. --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- settings.gradle.kts | 2 +- tools/mklanguages/build.gradle.kts | 2 +- tools/mkserverversions/build.gradle.kts | 4 ++-- tools/mvstring/build.gradle.kts | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930..a80b22ce5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle.kts b/settings.gradle.kts index 36bca311e..d3dddfefb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS repositories { google() mavenCentral() diff --git a/tools/mklanguages/build.gradle.kts b/tools/mklanguages/build.gradle.kts index b51c94c31..69943a754 100644 --- a/tools/mklanguages/build.gradle.kts +++ b/tools/mklanguages/build.gradle.kts @@ -16,7 +16,7 @@ */ application { - mainClass.set("app.pachli.mklanguages.MainKt") + mainClass = "app.pachli.mklanguages.MainKt" } dependencies { diff --git a/tools/mkserverversions/build.gradle.kts b/tools/mkserverversions/build.gradle.kts index c3fbb5b4b..555e698ef 100644 --- a/tools/mkserverversions/build.gradle.kts +++ b/tools/mkserverversions/build.gradle.kts @@ -20,7 +20,7 @@ plugins { } application { - mainClass.set("app.pachli.mkserverversions.MainKt") + mainClass = "app.pachli.mkserverversions.MainKt" } dependencies { @@ -44,6 +44,6 @@ tasks.test { apollo { service("service") { - packageName.set("app.pachli.mkserverversions.fediverseobserver") + packageName = "app.pachli.mkserverversions.fediverseobserver" } } diff --git a/tools/mvstring/build.gradle.kts b/tools/mvstring/build.gradle.kts index ee78a0003..00a64e9c4 100644 --- a/tools/mvstring/build.gradle.kts +++ b/tools/mvstring/build.gradle.kts @@ -16,7 +16,7 @@ */ application { - mainClass.set("app.pachli.mvstring.MainKt") + mainClass = "app.pachli.mvstring.MainKt" } dependencies {