diff --git a/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt b/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt index 94e82f47..fd33069f 100644 --- a/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt +++ b/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt @@ -12,9 +12,7 @@ abstract class SpigotDependencyExtension( .convention(version.map { it.replace("-R\\d+\\.\\d+-SNAPSHOT".toRegex(), "") }) - val configuration = objects.property(String::class.java) val classifier = objects.property(String::class.java).convention("remapped-mojang") - val ext = objects.property(String::class.java) val java = objects.property(JavaToolchainSpec::class.java) val ignoreCached = objects.property(Boolean::class.java).convention(false) diff --git a/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt b/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt index f9304be4..8cdfae20 100644 --- a/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt +++ b/buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt @@ -46,12 +46,7 @@ abstract class SpigotSetup : Plugin { // Add Spigot dependency. val dependency = target.dependencies.create( - "org.spigotmc", - "spigot", - spigotExt.version.get(), - spigotExt.configuration.orNull, - spigotExt.classifier.orNull, - spigotExt.ext.orNull + "org.spigotmc:spigot:${spigotExt.version.get()}:${spigotExt.classifier.getOrElse("")}" ) target.dependencies.add("compileOnly", dependency) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..1b33c55b 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 ca025c83..c61a118f 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -205,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. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 637ea8df..12c3faac 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -27,8 +27,10 @@ dependencies { tasks.processResources { expand( - "version" to version, - "sqlite" to libs.sqlite.jdbc.get().version + mutableMapOf( + "version" to version, + "sqlite" to libs.sqlite.jdbc.get().version + ) ) }