Update Gradle and some plugins (#273)

* Bump Kotlin Language version to 1.5
* Update Gradle to 8.4
* Fix deprecation warning

.github/dependabot.yml

@@ -12,3 +12,7 @@ updates:
       - gradle-plugin-portal
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+        interval: "daily"

build.gradle.kts

@@ -25,7 +25,7 @@ tasks.withType(Test::class.java).configureEach {
 }
 
 tasks.wrapper {
-  gradleVersion = "8.0.2"
+  gradleVersion = "8.4"
 }
 
 tasks.register("pluginTasks").configure {

docs/changelog.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 * [Implement Apple Rosetta Translation Check](https://github.com/runningcode/gradle-doctor/pull/220) Thanks [Gediminas Zuckas](https://github.com/GediminasZukas)
+* Bump Kotlin language version to 1.5
 
 ## 0.8.1
 * [Fix compatibility with KGP 1.7.0](https://github.com/runningcode/gradle-doctor/issues/208) Thanks [ZacSweers](https://github.com/ZacSweers)

doctor-plugin/build.gradle.kts

@@ -167,7 +167,7 @@ tasks.withType<Sign>().configureEach {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
-        languageVersion = "1.4"
-        apiVersion = "1.4"
+        languageVersion = "1.5"
+        apiVersion = "1.5"
     }
 }

doctor-plugin/src/main/java/com/osacky/doctor/internal/CoCaHelpers.kt

@@ -10,8 +10,12 @@ fun isGradle65OrNewer(): Boolean {
     return GradleVersion.current() >= GradleVersion.version("6.5")
 }
 
+fun isGradle74OrNewer(): Boolean {
+    return GradleVersion.current() >= GradleVersion.version("7.4")
+}
+
 fun sysProperty(name: String, providers: ProviderFactory): Optional<String> {
-    if (isGradle65OrNewer()) {
+    if (isGradle65OrNewer() && !isGradle74OrNewer()) {
         val property = providers.systemProperty(name).forUseAtConfigurationTime()
         return Optional.ofNullable(property.orNull)
     }

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-kotlin = "1.8.21"
+kotlin = "1.9.20"
 junit = "4.13.2"
 
 [libraries]
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-gradle-plugin-lib = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-truth = "com.google.truth:truth:1.1.3"
+truth = "com.google.truth:truth:1.1.5"
 tagger = "com.osacky.tagger:tagger-lib:0.2"
 rxjava = "io.reactivex.rxjava3:rxjava:3.1.6"
 mockito = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
@@ -14,5 +14,5 @@ mockito = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 kgp = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 versions = { id = "com.github.ben-manes.versions", version = "0.46.0" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "3.13.0" }
-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.1.0" }
+plugin-publish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # 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"'
+# 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
@@ -133,26 +131,29 @@ 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.
 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
+        # shellcheck disable=SC2039,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
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle.kts

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-  id("com.gradle.enterprise") version "3.13"
+  id("com.gradle.enterprise") version "3.15.1"
 }
 
 gradleEnterprise {