Gradle 8 (#87)

* Fix deprecation warning in KAPT

> Task :kotlin-power-assert-plugin:kaptTestKotlin
Annotation processors discovery from compile classpath is deprecated.
Set 'kapt.include.compile.classpath=false' to disable discovery.

* Fix kotlinc warning in InfixFunctionTest

> Task :kotlin-power-assert-plugin:compileTestKotlin
w: P:\projects\contrib\github-kotlin-power-assert\kotlin-power-assert-plugin\src\test\kotlin\com\bnorm\power\InfixFunctionTest.kt: (357, 9): Name shadowed: main

* Fix kotlinc warning in PowerAssertCallTransformer

> Task :kotlin-power-assert-plugin:compileKotlin
w: P:\projects\contrib\github-kotlin-power-assert\kotlin-power-assert-plugin\src\main\kotlin\com\bnorm\power\PowerAssertCallTransformer.kt: (174, 77): Name shadowed: newVariables

* Fix Gradle 8 breaking change, add dependency between tasks.

> Task :kotlin-power-assert-gradle:publishPluginJar
Execution optimizations have been disabled for task ':kotlin-power-assert-gradle:publishPluginJar' to ensure correctness due to the following reasons:
  - Gradle detected a problem with the following location: 'P:\projects\contrib\github-kotlin-power-assert\kotlin-power-assert-gradle\build\generated\source\buildConfig\main\main'. Reason: Task ':kotlin-power-assert-gradle:publishPluginJar' uses this output of task ':kotlin-power-assert-gradle:generateBuildConfig' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Please refer to https://docs.gradle.org/7.4.2/userguide/validation_problems.html#implicit_dependency for more details about this problem.
Gradle detected a problem with the following location: 'P:\projects\contrib\github-kotlin-power-assert\kotlin-power-assert-gradle\build\generated\source\buildConfig\main\main'. Reason: Task ':kotlin-power-assert-gradle:publishPluginJar' uses this output of task ':kotlin-power-assert-gradle:generateBuildConfig' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Please refer to https://docs.gradle.org/7.4.2/userguide/validation_problems.html#implicit_dependency for more details about this problem. This behaviour has been deprecated and is scheduled to be removed in Gradle 8.0. Execution optimizations are disabled to ensure correctness. See https://docs.gradle.org/7.4.2/userguide/more_about_tasks.html#sec:up_to_date_checks for more details.

* Fix gmazzo/gradle-buildconfig-plugin#38 by using the latest version.

* Update Gradle wrapper to 7.x latest 7.6.1

* Build URI using built-in function instead of string manipulation.

* Reduce code duplication and be a bit more explicit.

* Upgrade plugin-publish to latest 1.1.0

Action "Deprecate the entire `pluginBundle` block when using Gradle version 7.6 or later,
        mark for removal in version 8.0" from https://plugins.gradle.org/plugin/com.gradle.plugin-publish/1.0.0-rc-3

Gradle publishing has to execute publishPlugins directly, because the new version already applies the Maven Publish Plugin, that creates the task "publish", which publishes to registered repositories only.

* Add test repository to all modules (enabled by plugin-publish 1.0)

* Bump Gradle to latest 8.x stable 8.0.2

* Downgrade Gradle in sample project because of removed outdated API (details below), assuming Kotlin 1.7 to 1.8 bump is not wanted yet.

* What went wrong:
Failed to notify task execution graph listener.
> org.gradle.api.reporting.DirectoryReport.setEnabled(Z)V

Caused by: java.lang.NoSuchMethodError: org.gradle.api.reporting.DirectoryReport.setEnabled(Z)V
        at org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport.disableTestReporting(KotlinTestReport.kt:242)

https://github.com/JetBrains/kotlin/blob/v1.7.0/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt#L242

Gradle 8.0 removed that deprecated property:
https://docs.gradle.org/current/userguide/upgrading_version_7.html#report_and_testreport_api_cleanup

Fixed in Kotlin 1.8.0: JetBrains/kotlin@e902ae7

Deprecation warnings in sample project are all related to this, run: `sample$ gradlew build --warning-mode=all` for more info.

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
   kotlin("jvm") version "1.7.0" apply false
   id("org.jetbrains.dokka") version "1.7.0" apply false
-  id("com.gradle.plugin-publish") version "0.11.0" apply false
-  id("com.github.gmazzo.buildconfig") version "2.0.2" apply false
+  id("com.gradle.plugin-publish") version "1.1.0" apply false
+  id("com.github.gmazzo.buildconfig") version "3.1.0" apply false
 }
 
 allprojects {

gradle.properties

@@ -0,0 +1 @@
+kapt.include.compile.classpath=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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/.
@@ -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"'
@@ -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
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

kotlin-power-assert-gradle/build.gradle.kts

@@ -20,19 +20,16 @@ buildConfig {
   buildConfigField("String", "PLUGIN_VERSION", "\"${project.version}\"")
 }
 
-pluginBundle {
-  website = "https://github.com/bnorm/kotlin-power-assert"
-  vcsUrl = "https://github.com/bnorm/kotlin-power-assert.git"
-  tags = listOf("kotlin", "power-assert")
-}
-
 gradlePlugin {
+  website.set("https://github.com/bnorm/kotlin-power-assert")
+  vcsUrl.set("https://github.com/bnorm/kotlin-power-assert.git")
   plugins {
     create("kotlinPowerAssert") {
       id = "com.bnorm.power.kotlin-power-assert"
       displayName = "Kotlin Power Assertion Plugin"
       description = "Kotlin Compiler Plugin to add power to your assertions"
       implementationClass = "com.bnorm.power.PowerAssertGradlePlugin"
+      tags.set(listOf("kotlin", "power-assert"))
     }
   }
 }
@@ -41,6 +38,15 @@ tasks.withType<KotlinCompile> {
   kotlinOptions.jvmTarget = "1.8"
 }
 
-tasks.register("publish") {
+tasks.named("publish") {
   dependsOn("publishPlugins")
 }
+
+publishing {
+  repositories {
+    maven {
+      name = "test"
+      url = uri(rootProject.layout.buildDirectory.dir("localMaven"))
+    }
+  }
+}

kotlin-power-assert-plugin/build.gradle.kts

@@ -92,11 +92,11 @@ publishing {
       hasProperty("sonatypeReleaseUrl")
     ) {
       maven {
-        val url = when {
-          "SNAPSHOT" in version.toString() -> property("sonatypeSnapshotUrl")
-          else -> property("sonatypeReleaseUrl")
-        } as String
-        setUrl(url)
+        val sonatypeUrlProperty = when {
+          version.toString().endsWith("-SNAPSHOT") -> "sonatypeSnapshotUrl"
+          else -> "sonatypeReleaseUrl"
+        }
+        setUrl(property(sonatypeUrlProperty) as String)
         credentials {
           username = property("sonatypeUsername") as String
           password = property("sonatypePassword") as String
@@ -105,7 +105,7 @@ publishing {
     }
     maven {
       name = "test"
-      setUrl("file://${rootProject.buildDir}/localMaven")
+      url = uri(rootProject.layout.buildDirectory.dir("localMaven"))
     }
   }
 }

kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt

@@ -170,9 +170,9 @@ class PowerAssertCallTransformer(
       }
     }
 
-    return buildDiagramNestingNullable(dispatchRoot) { dispatch, newVariables ->
-      buildDiagramNestingNullable(extensionRoot, newVariables) { extension, newVariables ->
-        recursive(0, dispatch, extension, emptyList(), newVariables)
+    return buildDiagramNestingNullable(dispatchRoot) { dispatch, dispatchNewVariables ->
+      buildDiagramNestingNullable(extensionRoot, dispatchNewVariables) { extension, extensionNewVariables ->
+        recursive(0, dispatch, extension, emptyList(), extensionNewVariables)
       }
     }
   }

kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/InfixFunctionTest.kt

@@ -354,10 +354,10 @@ class InfixFunctionTest {
     assertEquals(KotlinCompilation.ExitCode.OK, result.exitCode, "Failed with messages: " + result.messages)
 
     val kClazz = result.classLoader.loadClass(main)
-    val main = kClazz.declaredMethods.single { it.name == "main" && it.parameterCount == 0 }
+    val mainMethod = kClazz.declaredMethods.single { it.name == "main" && it.parameterCount == 0 }
     try {
       try {
-        main.invoke(null)
+        mainMethod.invoke(null)
       } catch (t: InvocationTargetException) {
         throw t.cause!!
       }

sample/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/gradlew

@@ -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/.
@@ -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"'
@@ -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
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

sample/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal