diff --git a/README.md b/README.md index f8700f7..32e5a81 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ktlint GitHub reporter -[![Kotlin](https://img.shields.io/badge/Kotlin-1.8.20-blue.svg)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.10-blue.svg)](http://kotlinlang.org) [![CI](https://github.com/musichin/ktlint-github-reporter/actions/workflows/ci.yml/badge.svg)](https://github.com/musichin/ktlint-github-reporter/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/musichin/ktlint-github-reporter/branch/main/graph/badge.svg?token=I2LXI4OUBT)](https://codecov.io/gh/musichin/ktlint-github-reporter) diff --git a/build.gradle.kts b/build.gradle.kts index 7c79b12..0521f43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.10" jacoco - id("com.vanniktech.maven.publish") version "0.25.2" + id("com.vanniktech.maven.publish") version "0.25.3" } repositories { @@ -9,7 +9,7 @@ repositories { } dependencies { - implementation("com.pinterest.ktlint:ktlint-cli-reporter:0.49.0") + implementation("com.pinterest.ktlint:ktlint-cli-reporter-core:1.0.0") testImplementation(kotlin("test")) } @@ -18,7 +18,7 @@ tasks.test { } jacoco { - toolVersion = "0.8.9" + toolVersion = "0.8.10" } tasks.jacocoTestReport { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..7f93135 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 8707e8b..d11cdd9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can.