diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f9d2612..0000000 --- a/build.gradle +++ /dev/null @@ -1,131 +0,0 @@ -plugins { - id 'java' - id 'maven-publish' - id 'org.jetbrains.kotlin.jvm' version '1.7.20' - id 'com.github.johnrengelman.shadow' version '7.1.0' - id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0.1' -} - -group = 'ir.syrent.enhancedvelocity' -version = findProperty("version") - -repositories { - mavenLocal() - mavenCentral() - - maven { - url = uri('https://repo.maven.apache.org/maven2/') - } - - // Velocity-API - maven { - name 'papermc' - url 'https://repo.papermc.io/repository/maven-public/' - } - - maven { - name = "sonatype-oss-snapshots1" - url = "https://s01.oss.sonatype.org/content/repositories/snapshots/" - } -} - -dependencies { - compileOnly 'com.velocitypowered:velocity-api:3.1.1' - - implementation 'org.bstats:bstats-velocity:3.0.0' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - implementation 'net.kyori:adventure-text-minimessage:4.11.0' - implementation 'org.spongepowered:configurate-yaml:4.1.2' - implementation 'commons-io:commons-io:2.6' - - annotationProcessor 'com.velocitypowered:velocity-api:3.1.1' -} - -processResources { - def props = [version: version] - inputs.properties props - filteringCharset 'UTF-8' - filesMatching('plugin.yml') { - expand props - } -} - -shadowJar { - minimize() - - relocate('me.mohamad82.ruom', 'ir.syrent.enhancedvelocity.ruom') - relocate('org.bstats', 'ir.syrent.enhancedvelocity.bstats') - relocate('org.spongepowered', 'ir.syrent.spongepowered') - - // @see https://youtrack.jetbrains.com/issue/KT-25709 - exclude '**/*.kotlin_metadata' - exclude '**/*.kotlin_module' - exclude '**/*.kotlin_builtins' - - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" -} - -jar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" -} - -def targetJavaVersion = 8 -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - sourceCompatibility = javaVersion - targetCompatibility = javaVersion - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } -} - -tasks.withType(JavaCompile).configureEach { - options.deprecation = true - options.encoding = 'UTF-8' -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions { - jvmTarget = "8" - freeCompilerArgs += ["-Xjvm-default=all"] - } -} - -compileJava.options.encoding = 'UTF-8' -compileJava.dependsOn clean - -build.dependsOn shadowJar - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} - -clean.doLast { - file("${rootDir}/bin").deleteDir() -} - -def templateSource = file('src/main/templates') -def templateDest = layout.buildDirectory.dir('generated/sources/templates') -def generateTemplates = tasks.register('generateTemplates', Copy) { task -> - def props = [ - 'version': project.version - ] - task.inputs.properties props - - task.from templateSource - task.into templateDest - task.expand props -} -sourceSets.main.java.srcDir(generateTemplates.map { it.outputs }) -rootProject.idea.project.settings.taskTriggers.afterSync generateTemplates - -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..e52b0a7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,169 @@ +plugins { + `java-library` + `maven-publish` + kotlin("jvm") version "2.0.0" + id("io.github.goooler.shadow") version "8.1.7" +} + +group = "ir.syrent" +version = findProperty("version") +val slug = "enhancedvelocity" +description = "Customize your Velocity network experience" + +repositories { + mavenLocal() + mavenCentral() + + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } + + // Velocity-API + maven { + name = "papermc" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + + maven { + name = "sonatype-oss-snapshots1" + url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + } +} + +dependencies { + compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") + + implementation("org.bstats:bstats-velocity:3.0.0") +// implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' + implementation("net.kyori:adventure-text-minimessage:4.11.0") + implementation("org.spongepowered:configurate-yaml:4.1.2") + implementation("commons-io:commons-io:2.6") +} +java { + withSourcesJar() +} + +tasks { + build { + dependsOn(shadowJar) + } + + processResources { + filesMatching(listOf("**plugin.yml", "**plugin.json")) { + expand( + "version" to rootProject.version as String, + "slug" to slug, + "name" to rootProject.name, + "description" to rootProject.description + ) + } + } + + val relocations = mutableMapOf( + "org.bstats" to "ir.syrent.enhancedvelocity.bstats", + "org.spongepowered" to "ir.syrent.spongepowered" + ) + + shadowJar { + minimize() + + archiveFileName = (findProperty("plugin-name") as String) + " v" + findProperty("version") + ".jar" + archiveClassifier.set(null as String?) + } + + jar { + archiveFileName = (findProperty("plugin-name") as String) + " v" + findProperty("version") + " " + "unshaded" + ".jar" + } + + withType() { + destinationDirectory = file("$rootDir/bin/") + } + + named("sourcesJar") { + relocations.forEach { (from, to) -> + val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)") + val textPattern = Regex.fromLiteral(from) + eachFile { + filter { + it.replaceFirst(textPattern, to) + } + path = path.replaceFirst(filePattern, "$1${to.replace('.', '/')}$2") + } + } + } +} + + +configurations { + "apiElements" { + attributes { + attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_API)) + attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY)) + attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED)) + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR)) + attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17) + } + outgoing.artifact(tasks.named("shadowJar")) + } + "runtimeElements" { + attributes { + attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME)) + attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY)) + attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED)) + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR)) + attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17) + } + outgoing.artifact(tasks.named("shadowJar")) + } + "mainSourceElements" { + attributes { + attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME)) + attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.DOCUMENTATION)) + attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED)) + attribute(DocsType.DOCS_TYPE_ATTRIBUTE, project.objects.named(DocsType.SOURCES)) + } + } +} + +publishing { + publications { + create("maven") { + shadow.component(this) + artifact(tasks["sourcesJar"]) + setPom(this) + } + } + + repositories { + maven { + name = "sayandevelopment-repo" + url = uri("https://repo.sayandev.org/snapshots/") + + credentials { + username = System.getenv("REPO_SAYAN_USER") ?: project.findProperty("repo.sayan.user") as String + password = System.getenv("REPO_SAYAN_TOKEN") ?: project.findProperty("repo.sayan.token") as String + } + } + } +} + +fun setPom(publication: MavenPublication) { + publication.pom { + name.set("sayanvanish") + description.set(project.description) + url.set("https://github.com/syrent/enhancedvelocity") + developers { + developer { + id.set("syrent") + name.set("abbas") + email.set("syrent2356@gmail.com") + } + } + scm { + connection.set("scm:git:github.com/syrent/enhancedvelocity.git") + developerConnection.set("scm:git:ssh://github.com/syrent/enhancedvelocity.git") + url.set("https://github.com/syrent/enhancedvelocity/tree/master") + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 547861e..031873e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,7 @@ version=1.3.3 -plugin-name=EnhancedVelocity \ No newline at end of file +plugin-name=EnhancedVelocity +kotlin.code.style=official +org.gradle.caching=true +org.gradle.parallel=true +org.gradle.vfs.watch=true +systemProp.file.encoding=utf-8 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..e644113 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 2e6e589..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..b740cf1 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +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, +# 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. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 9ac7d2c..5acfd55 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'EnhancedVelocity' +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +rootProject.name = "EnhancedVelocity" diff --git a/src/main/templates/ir/syrent/enhancedvelocity/BuildConstants.java b/src/main/templates/ir/syrent/enhancedvelocity/BuildConstants.java deleted file mode 100644 index b93f270..0000000 --- a/src/main/templates/ir/syrent/enhancedvelocity/BuildConstants.java +++ /dev/null @@ -1,7 +0,0 @@ -package ir.syrent.enhancedvelocity; - -// The constants are replaced before compilation -public class BuildConstants { - - public static final String VERSION = "${version}"; -}