diff --git a/fixtures/golden/buildsrc/plugin-in-buildsrc.kotlin.json b/fixtures/golden/buildsrc/plugin-in-buildsrc.kotlin.json index daeb021..b891577 100644 --- a/fixtures/golden/buildsrc/plugin-in-buildsrc.kotlin.json +++ b/fixtures/golden/buildsrc/plugin-in-buildsrc.kotlin.json @@ -57,24 +57,24 @@ "hash": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o=" } }, - "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.1.2": { - "gradle-kotlin-dsl-plugins-5.1.2.jar": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.jar", - "hash": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=" + "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.2.0": { + "gradle-kotlin-dsl-plugins-5.2.0.jar": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.jar", + "hash": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=" }, - "gradle-kotlin-dsl-plugins-5.1.2.module": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.module", - "hash": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=" + "gradle-kotlin-dsl-plugins-5.2.0.module": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.module", + "hash": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=" }, - "gradle-kotlin-dsl-plugins-5.1.2.pom": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.pom", - "hash": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "gradle-kotlin-dsl-plugins-5.2.0.pom": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.pom", + "hash": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" } }, - "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.2": { - "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom", - "hash": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.2.0": { + "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom", + "hash": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" } }, "org.jetbrains:annotations:13.0": { diff --git a/flake.lock b/flake.lock index 0a34adb..7d93dc2 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { diff --git a/gradle.lock b/gradle.lock index dc858fc..4693ead 100644 --- a/gradle.lock +++ b/gradle.lock @@ -567,38 +567,38 @@ "hash": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" } }, - "org.gradle:gradle-tooling-api:8.12": { - "gradle-tooling-api-8.12.jar": { - "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.jar", - "hash": "sha256-E83CJbXoqfUumQ1GWNnmPGrz8DAc0VWv2Ulpm5UP5Mk=" + "org.gradle:gradle-tooling-api:8.13": { + "gradle-tooling-api-8.13.jar": { + "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.13/gradle-tooling-api-8.13.jar", + "hash": "sha256-3oBit6r50rNd8cYtuwCXjFtBwFwMMOXy/Zz1kATw1dw=" }, - "gradle-tooling-api-8.12.module": { - "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.module", - "hash": "sha256-WUNWwl7AANbkn6vxhnKU9CQhh73Ay3DaCSoZkHlP/lQ=" + "gradle-tooling-api-8.13.module": { + "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.13/gradle-tooling-api-8.13.module", + "hash": "sha256-x0zW6v/6m/u9BTCfD9eKyeCHDYBbuVKo9mPABkuGQtQ=" }, - "gradle-tooling-api-8.12.pom": { - "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.pom", - "hash": "sha256-TOuw8aZAUe7Q69OhyGG5VMkUAhMYOFFoRX5Ztgz1SKI=" + "gradle-tooling-api-8.13.pom": { + "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.13/gradle-tooling-api-8.13.pom", + "hash": "sha256-5q1vZVgMqhOaE9Gg+WaPu3W7flYqnw6EEixjjrWyz4Q=" } }, - "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.1.2": { - "gradle-kotlin-dsl-plugins-5.1.2.jar": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.jar", - "hash": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=" + "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.2.0": { + "gradle-kotlin-dsl-plugins-5.2.0.jar": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.jar", + "hash": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=" }, - "gradle-kotlin-dsl-plugins-5.1.2.module": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.module", - "hash": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=" + "gradle-kotlin-dsl-plugins-5.2.0.module": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.module", + "hash": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=" }, - "gradle-kotlin-dsl-plugins-5.1.2.pom": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.pom", - "hash": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "gradle-kotlin-dsl-plugins-5.2.0.pom": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.pom", + "hash": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" } }, - "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.2": { - "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom": { - "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom", - "hash": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.2.0": { + "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom": { + "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom", + "hash": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" } }, "org.jdom:jdom2:2.0.6.1": { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6727e61..79fa1a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -gradle = "8.12" +gradle = "8.13" junit = "5.8.2" # Intentionally using the version embedded in Gradle to reduce dependency count # See https://docs.gradle.org/current/userguide/compatibility.html#kotlin diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 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 e0fd020..ed4c299 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.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi 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, +# * DEFAULT_JVM_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.