Update for Gradle 7.0, update jackson dependencies

This commit is contained in:
Minecrell 2021-04-30 10:25:25 +02:00
parent 07b13e57a5
commit b976a8e983
8 changed files with 86 additions and 84 deletions

View file

@ -1,10 +1,10 @@
sudo: false sudo: false
dist: trusty dist: bionic
language: java language: java
jdk: jdk:
- openjdk8 - openjdk8
- oraclejdk8 - openjdk11
install: true install: true
script: ./gradlew build script: ./gradlew build

View file

@ -2,8 +2,8 @@ plugins {
`java-gradle-plugin` `java-gradle-plugin`
`kotlin-dsl` `kotlin-dsl`
`maven-publish` `maven-publish`
id("com.gradle.plugin-publish") version "0.9.10" id("com.gradle.plugin-publish") version "0.14.0"
id("net.minecrell.licenser") version "0.3" id("org.cadixdev.licenser") version "0.6.0"
} }
val url: String by extra val url: String by extra
@ -13,30 +13,34 @@ repositories {
} }
dependencies { dependencies {
compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6") { implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3") {
exclude(group = "org.jetbrains.kotlin") exclude(group = "org.jetbrains.kotlin")
} }
compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.6") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3")
} }
val sourceJar = task<Jar>("sourceJar") { java {
classifier = "sources" withSourcesJar()
from(java.sourceSets["main"].allSource)
} }
artifacts.add("archives", sourceJar)
gradlePlugin { gradlePlugin {
(plugins) { plugins {
"bukkit" { register("bukkit") {
id = "net.minecrell.plugin-yml.bukkit" id = "net.minecrell.plugin-yml.bukkit"
displayName = "plugin-yml (Bukkit)"
description = "Generate plugin.yml for Bukkit plugins based on the Gradle project"
implementationClass = "net.minecrell.pluginyml.bukkit.BukkitPlugin" implementationClass = "net.minecrell.pluginyml.bukkit.BukkitPlugin"
} }
"bungee" { register("bungee") {
id = "net.minecrell.plugin-yml.bungee" id = "net.minecrell.plugin-yml.bungee"
displayName = "plugin-yml (BungeeCord)"
description = "Generate bungee.yml for BungeeCord plugins based on the Gradle project"
implementationClass = "net.minecrell.pluginyml.bungee.BungeePlugin" implementationClass = "net.minecrell.pluginyml.bungee.BungeePlugin"
} }
"nukkit" { register("nukkit") {
id = "net.minecrell.plugin-yml.nukkit" id = "net.minecrell.plugin-yml.nukkit"
displayName = "plugin-yml (Nukkit)"
description = "Generate nukkit.yml for Nukkit plugins based on the Gradle project"
implementationClass = "net.minecrell.pluginyml.nukkit.NukkitPlugin" implementationClass = "net.minecrell.pluginyml.nukkit.NukkitPlugin"
} }
} }
@ -44,9 +48,8 @@ gradlePlugin {
publishing { publishing {
publications { publications {
create<MavenPublication>("mavenJava") { register<MavenPublication>("mavenJava") {
from(components["java"]) from(components["java"])
artifact(sourceJar)
} }
} }
} }
@ -56,22 +59,4 @@ pluginBundle {
vcsUrl = url vcsUrl = url
description = project.description description = project.description
tags = listOf("bukkit", "bungee", "nukkit") tags = listOf("bukkit", "bungee", "nukkit")
(plugins) {
"bukkit" {
id = "net.minecrell.plugin-yml.bukkit"
displayName = "plugin-yml (Bukkit)"
description = "Generate plugin.yml for Bukkit plugins based on the Gradle project"
}
"bungee" {
id = "net.minecrell.plugin-yml.bungee"
displayName = "plugin-yml (BungeeCord)"
description = "Generate bungee.yml for BungeeCord plugins based on the Gradle project"
}
"nukkit" {
id = "net.minecrell.plugin-yml.nukkit"
displayName = "plugin-yml (Nukkit)"
description = "Generate nukkit.yml for Nukkit plugins based on the Gradle project"
}
}
} }

Binary file not shown.

View file

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

53
gradlew vendored
View file

@ -1,5 +1,21 @@
#!/usr/bin/env sh #!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################## ##############################################################################
## ##
## Gradle start up script for UN*X ## Gradle start up script for UN*X
@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
@ -66,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -109,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
@ -138,19 +156,19 @@ if $cygwin ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@ -159,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

43
gradlew.bat vendored
View file

@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail 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 :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @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 :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell

View file

@ -1,4 +1,2 @@
val name: String by settings val name: String by settings
rootProject.name = name rootProject.name = name
enableFeaturePreview("STABLE_PUBLISHING")

View file

@ -28,8 +28,8 @@ import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.JavaPlugin import org.gradle.api.plugins.JavaPlugin
import org.gradle.api.tasks.AbstractCopyTask import org.gradle.api.tasks.AbstractCopyTask
import org.gradle.kotlin.dsl.getValue import org.gradle.kotlin.dsl.named
import org.gradle.kotlin.dsl.task import org.gradle.kotlin.dsl.register
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import java.io.Serializable import java.io.Serializable
@ -45,18 +45,19 @@ abstract class PlatformPlugin<T : Serializable>(private val platformName: String
extensions.add(platformName.decapitalize(), description) extensions.add(platformName.decapitalize(), description)
// Create task // Create task
val generateTask = task<GeneratePluginDescription>("generate${platformName}PluginDescription") { val generateTask = tasks.register<GeneratePluginDescription>("generate${platformName}PluginDescription") {
fileName = this@PlatformPlugin.fileName fileName = this@PlatformPlugin.fileName
pluginDescription = description pluginDescription = description
}
generateTask.doFirst { doFirst {
prepare(project, description) prepare(project, description)
}
} }
plugins.withType<JavaPlugin> { plugins.withType<JavaPlugin> {
val processResources: AbstractCopyTask by tasks tasks.named<AbstractCopyTask>("processResources") {
processResources.from(generateTask) from(generateTask)
}
} }
} }
} }