1.6.0: Update to Gradle 8.11 and Kotlin 2.0.20.

Kord-Extensions · Nov 28, 2024 · 54c6779 · 54c6779
1 parent cc7f303
commit 54c6779
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 15 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 This repository contains Gradle plugins intended for use with Kord Extensions.
 
+**All plugins require Gradle 8.11 or later.**
+
 # Contents
 
 - `docker/` - Docker Gradle plugin for Dockerfile generation.

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-	implementation(kotlin("gradle-plugin", version = "1.9.23"))
-	implementation(kotlin("serialization", version = "1.9.23"))
+	implementation(kotlin("gradle-plugin", version = "2.0.20"))
+	implementation(kotlin("serialization", version = "2.0.20"))
 
 	implementation("dev.yumi", "yumi-gradle-licenser", "1.2.0")
 	implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.6")

diff --git a/changes/1.6.0.md b/changes/1.6.0.md
@@ -0,0 +1,5 @@
+# Gradle Plugins 1.6.0
+
+This version updates all Gradle plugins to Gradle 8.11 and Kotlin 2.0.20.
+
+We no longer support older versions of Gradle.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ kotlin.incremental=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
 org.gradle.parallel=true
 
-projectVersion=1.5.8
+projectVersion=1.6.0
diff --git 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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/kordex/build.gradle.kts b/kordex/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
 	`kotlin-dsl`
 	plugin
+
 	val env = System.getenv()
 
 	if (env.contains("GITHUB_ACTIONS") && !env.contains("NO_SIGNING")) {

diff --git a/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt b/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt
@@ -37,12 +37,10 @@ import javax.inject.Inject
 
 @Suppress("UnstableApiUsage")
 class KordExPlugin @Inject constructor(
-	problems: Problems,
+	val problems: Problems,
 	val dependencies: DependencyFactory,
 	val providers: ProviderFactory,
 ) : Plugin<Project> {
-	val problemReporter = problems.forNamespace("dev.kordex")
-
 	@Suppress("UnnecessaryParentheses")
 	override fun apply(target: Project) {
 		val extension = target.extensions.create<KordExExtension>("kordEx").apply {
@@ -55,7 +53,7 @@ class KordExPlugin @Inject constructor(
 
 		KspPluginHelper.apply(target)
 
-		target.checkTask(extension, versionsProvider, problemReporter)
+		target.checkTask(extension, versionsProvider, problems.reporter)
 
 		target.configurations.all {
 			dependencies.addAllLater(
@@ -120,15 +118,15 @@ class KordExPlugin @Inject constructor(
 			val versions = versionsProvider.get()
 
 			if (extension.hasBot && extension.hasPlugin) {
-				problemReporter.throwing {
+				problems.reporter.throwing {
 					withException(
 						RuntimeException(
 							"Project is both bot and plugin - if you need both in the same project, split them into " +
 								"separate Gradle subprojects"
 						)
 					)
 
-					id("both-bot-and-plugin", "Project is both bot and plugin")
+					id("dev.kordex.gradle.plugins.kordex.both-bot-and-plugin", "Project is both bot and plugin")
 					details("Project ${target.name} cannot be both a bot and a plugin")
 					solution("If you need both in the same project, split them into separate Gradle subprojects")
 					severity(Severity.ERROR)

diff --git a/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/functions/_CheckTask.kt b/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/functions/_CheckTask.kt
@@ -87,7 +87,7 @@ fun Project.checkTask(
 					)
 
 					problemReporter.reporting {
-						id("kotlin-version", "Incompatible Kotlin plugin found")
+						id("dev.kordex.gradle.plugins.kordex.kotlin-version", "Incompatible Kotlin plugin found")
 
 						details(
 							"Incompatible Kotlin plugin found - Kord Extensions version " +
@@ -106,7 +106,10 @@ fun Project.checkTask(
 							)
 						)
 
-						id("kotlin-version", "Incompatible Kotlin plugin version found")
+						id(
+							"dev.kordex.gradle.plugins.kordex.kotlin-version",
+							"Incompatible Kotlin plugin version found"
+						)
 
 						details(
 							"Incompatible Kotlin plugin found - Kord Extensions version " +

diff --git a/testModule/gradle/wrapper/gradle-wrapper.properties b/testModule/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/testModule/settings.gradle.kts b/testModule/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		val pluginVersion = "1.5.8"
+		val pluginVersion = "1.6.0"
 
 		kotlin("jvm") version "2.0.21"