Merge pull request #132 from neeme-praks-sympower/upgrade-to-gradle-8

Upgrade to Gradle 8

build.gradle.kts

@@ -3,7 +3,7 @@
 plugins {
     kotlin("jvm")
     `java-gradle-plugin`
-    id("com.gradle.plugin-publish") version "0.14.0"
+    id("com.gradle.plugin-publish") version "1.1.0"
     `maven-publish`
 }
 
@@ -57,11 +57,16 @@ configurations.all {
 
 
 gradlePlugin {
+    website.set(extra["pluginBundle.website"].toString())
+    vcsUrl.set(extra["pluginBundle.vcsUrl"].toString())
     testSourceSets(integrationTest)
 
     plugins.create("testSetsPlugin") {
         id = "org.unbroken-dome.test-sets"
         implementationClass = "org.unbrokendome.gradle.plugins.testsets.TestSetsPlugin"
+        displayName = extra["pluginBundle.displayName"].toString()
+        description = extra["pluginBundle.description"].toString()
+        tags.set(extra["pluginBundle.tags"].toString().split(','))
     }
 }
 
@@ -78,18 +83,4 @@ tasks {
     withType<Test> {
         useJUnitPlatform()
     }
-}
-
-
-pluginBundle {
-    website = extra["pluginBundle.website"].toString()
-    vcsUrl = extra["pluginBundle.vcsUrl"].toString()
-    description = extra["pluginBundle.description"].toString()
-    tags = extra["pluginBundle.tags"].toString().split(',')
-
-    (plugins) {
-        "testSetsPlugin" {
-            displayName = extra["pluginBundle.displayName"].toString()
-        }
-    }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/kotlin/org/unbrokendome/gradle/plugins/testsets/TestSetsPlugin.kt

@@ -127,10 +127,7 @@ class TestSetsPlugin
             task.group = BasePlugin.BUILD_GROUP
             task.from(testSet.sourceSet.output)
 
-            // Classifier is deprecated, but the new archiveClassifier was added only in Gradle 5.1
-            // For compatibility we will still use the old one
-            @Suppress("DEPRECATION")
-            task.classifier = testSet.classifier
+            task.archiveClassifier.set(testSet.classifier)
         }