feat: add support for gradle 9.x

Author: smartcmd

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-allay-gradle = "0.1.0"
+allay-gradle = "0.1.1"
 gradle-plugin-publish = "2.0.0"
 kotlin = "1.9.23"
 kotlinx-serialization = "1.5.0"

gradle/wrapper/gradle-wrapper.jar

@@ -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-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -11,7 +11,7 @@ import javax.inject.Inject
 @Suppress("MemberVisibilityCanBePrivate", "unused")
 @ExtensionMarker
 abstract class AllayExtension @Inject constructor(objects: ObjectFactory) {
-    val api: Property<String?> = objects.property(String::class.java)
+    val api: Property<String> = objects.property(String::class.java)
     val server: Property<String> = objects.property(String::class.java).convention("+")
     val apiOnly: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
 
@@ -26,7 +26,7 @@ abstract class AllayExtension @Inject constructor(objects: ObjectFactory) {
     abstract class Config(objects: ObjectFactory) {
         val extra = objects.mapProperty<String, Any>()
 
-        operator fun <K : Any, V> MapProperty<K, V>.set(key: K, value: V?) {
+        operator fun <K : Any, V : Any> MapProperty<K, V>.set(key: K, value: V?) {
             @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
             if (value != null) put(key, value)
         }
@@ -54,7 +54,7 @@ abstract class AllayExtension @Inject constructor(objects: ObjectFactory) {
 
         val website: Property<String> = objects.property(String::class.java)
 
-        operator fun <T> ListProperty<T>.plusAssign(item: T) = addAll(item)
+        operator fun <T : Any> ListProperty<T>.plusAssign(item: T) = addAll(item)
     }
 
     abstract class Extension @Inject constructor(objects: ObjectFactory) : Config(objects)

gradlew

@@ -16,7 +16,15 @@ class AllayPlugin : Plugin<Project> {
             maven("https://www.jetbrains.com/intellij-repository/releases/")
             maven("https://repo.opencollab.dev/maven-releases/")
             maven("https://repo.opencollab.dev/maven-snapshots/")
-            maven("https://storehouse.okaeri.eu/repository/maven-public/")
+            maven("https://storehouse.okaeri.eu/repository/maven-public/") {
+                content {
+                    // Storehouse's repository returns http status code 500 instead of 404 for non-existent
+                    // dependencies, which will cause the build to fail when using a dynamic version. To solve
+                    // this problem, we explicitly indicate that there is no allay-api in this repository as
+                    // well as allay-server
+                    excludeGroup("org.allaymc.allay")
+                }
+            }
         }
 
         project.afterEvaluate { afterEvaluate(project, extension) }

gradlew.bat

@@ -84,5 +84,5 @@ private fun String?.ensureVersion(project: Project, property: Property<String>)
 private fun String?.template(property: Property<String>) =
     this?.replace("\${it}", property.orNull ?: "") ?: property.orNull
 
-private operator fun <T> List<T>?.plus(property: ListProperty<T>) =
+private operator fun <T : Any> List<T>?.plus(property: ListProperty<T>) =
     (this ?: emptyList()) + property.get()