CivGradle port

.github/workflows/build_gradle_project.yaml

@@ -32,11 +32,6 @@ jobs:
         with:
           arguments: '${{inputs.project}}:build --scan'
 
-      - name: Build Project
-        run: |
-          echo "Building Project"
-          echo "Build Completed"
-
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v3
         with:

build.gradle.kts

@@ -0,0 +1 @@
+

plugins/CivSpy/build.gradle.kts

@@ -1,79 +1,20 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-val pluginName: String by project
 
 plugins {
-	`java-library`
-	id("com.adarshr.test-logger") version "3.2.0" apply false
-	id("com.github.johnrengelman.shadow") version "7.1.0" apply false
+	id("io.papermc.paperweight.userdev") version "1.5.10" apply false
+	id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+	id("xyz.jpenilla.run-paper") version "2.2.2" apply false
+}
+
+allprojects {
+	apply(from = "${rootProject.projectDir}/../../scripts/gradle/common.gradle")
 }
 
 subprojects {
 	apply(plugin = "java-library")
 	apply(plugin = "maven-publish")
-	apply(plugin = "com.adarshr.test-logger")
-
-	project.setProperty("archivesBaseName", "$pluginName-$name")
-
-	configure<JavaPluginExtension> {
-		withJavadocJar()
-		withSourcesJar()
-
-		toolchain {
-			languageVersion.set(JavaLanguageVersion.of(17))
-		}
-	}
 
 	repositories {
 		mavenCentral()
 		maven("https://oss.sonatype.org/content/repositories/snapshots")
 	}
-
-	dependencies {
-		testImplementation("org.junit.jupiter:junit-jupiter-api:5.2.0")
-		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0")
-	}
-
-	tasks.withType<Test> {
-		useJUnitPlatform()
-	}
-
-	afterEvaluate {
-		tasks.withType<ShadowJar> {
-			// Overwrite default jar
-			archiveClassifier.set("")
-		}
-
-		tasks.findByName("shadowJar")?.also {
-			tasks.named("assemble") { dependsOn(it) }
-		}
-	}
-
-	configure<PublishingExtension> {
-		repositories {
-			maven {
-				name = "GitHubPackages"
-				url = uri("https://maven.pkg.github.com/CivMC/$pluginName")
-				credentials {
-					username = System.getenv("GITHUB_ACTOR")
-					password = System.getenv("GITHUB_TOKEN")
-				}
-			}
-
-			val targetRepo = if (version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases"
-			maven {
-				name = "CivMC"
-				url = uri("https://repo.civmc.net/repository/$targetRepo/")
-				credentials {
-					username = System.getenv("CIVMC_NEXUS_USER")
-					password = System.getenv("CIVMC_NEXUS_PASSWORD")
-				}
-			}
-		}
-		publications {
-			register<MavenPublication>("mavenJava") {
-				from(components["java"])
-			}
-		}
-	}
 }

plugins/CivSpy/platform/paper/build.gradle.kts

@@ -1,10 +1,11 @@
-val pluginName: String by project
-
 plugins {
+	id("io.papermc.paperweight.userdev")
 	id("com.github.johnrengelman.shadow")
-	id("xyz.jpenilla.run-paper") version "1.0.6"
+	id("xyz.jpenilla.run-paper")
 }
 
+apply(from = "${rootProject.projectDir}/../../scripts/gradle/paper.gradle")
+
 repositories {
 	maven("https://papermc.io/repo/repository/maven-public/")
 }
@@ -12,7 +13,9 @@ repositories {
 dependencies {
 	implementation(project(":api"))
 
-	compileOnly("io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT")
+	paperweight {
+		paperDevBundle("1.18.2-R0.1-SNAPSHOT")
+	}
 }
 
 tasks {
@@ -23,17 +26,4 @@ tasks {
 		relocate("org.checkerframework", "com.programmerdan.minecraft.civspy.repack.checkerframework")
 		relocate("com.zaxxer.hikari", "com.programmerdan.minecraft.civspy.repack.hikari")
 	}
-
-	processResources {
-		filesMatching("plugin.yml") {
-			expand(mapOf(
-				"name" to pluginName,
-				"version" to version,
-			))
-		}
-	}
-
-	runServer {
-		minecraftVersion("1.18")
-	}
 }

plugins/CivSpy/platform/paper/src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
-name: ${name}
+name: ${pluginName}
 version: ${version}
 author: [ProgrammerDan]
 api-version: 1.13

plugins/CivSpy/settings.gradle.kts

@@ -7,6 +7,13 @@ pluginManagement {
 	}
 }
 
+plugins {
+	id("com.gradle.enterprise") version("3.16")
+}
+
+rootProject.name="civspy"
+
 include(":api")
 include(":platform:bungee")
 include(":platform:paper")
+project(":platform:paper").name = rootProject.name + "-paper"

scripts/civgradle/.github/workflows/build.yml

@@ -1,24 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build

scripts/civgradle/.github/workflows/publish.yml

@@ -1,25 +0,0 @@
-name: Publish
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CIVMC_NEXUS_USER: ${{ secrets.CIVMC_NEXUS_USER }}
-          CIVMC_NEXUS_PASSWORD: ${{ secrets.CIVMC_NEXUS_PASSWORD }}

scripts/civgradle/.gitignore

@@ -1,7 +0,0 @@
-.idea
-*.iml
-*.iws
-
-build/
-run/
-.gradle/

scripts/civgradle/LICENSE.txt

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2012-2021 AngrySoundTech
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

scripts/civgradle/README.md

@@ -1,4 +0,0 @@
-# CivGradle
-
-A Gradle plugin that provides common build
-configuration for civ plugins

scripts/civgradle/build.gradle.kts

@@ -1,69 +0,0 @@
-plugins {
-    kotlin("jvm") version "1.9.21"
-    id("java-gradle-plugin")
-    `maven-publish`
-}
-
-group = "net.civmc"
-version = "3.1.2"
-
-kotlin {
-    jvmToolchain {
-        this.languageVersion.set(JavaLanguageVersion.of(8))
-    }
-}
-
-repositories {
-    mavenCentral()
-    gradlePluginPortal()
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-dependencies {
-    implementation(kotlin("stdlib", "1.6.0"))
-    testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2") {
-        constraints {
-            implementation("commons-io:commons-io:2.12.0") {
-                because("Resolves CVE-2021-29425") // https://devhub.checkmarx.com/cve-details/CVE-2021-29425/
-            }
-        }
-    }
-
-    // Keep these plugin versions on the classpath, so we can update them all at once if needed.
-    implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16.1")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5") // https://github.com/PaperMC/paperweight/tags
-    implementation("xyz.jpenilla.run-paper:xyz.jpenilla.run-paper.gradle.plugin:2.2.2") // https://github.com/jpenilla/run-task/releases
-    implementation("com.github.johnrengelman:shadow:8.1.1")
-}
-
-gradlePlugin {
-    plugins {
-        create("net.civmc.civgradle") {
-            id = "net.civmc.civgradle"
-            implementationClass = "net.civmc.civgradle.CivGradlePlugin"
-            version = version
-        }
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/CivMC/CivGradle")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-        val targetRepo = if (version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases"
-        maven {
-            name = "CivMC"
-            url = uri("https://repo.civmc.net/repository/$targetRepo/")
-            credentials {
-                username = System.getenv("CIVMC_NEXUS_USER")
-                password = System.getenv("CIVMC_NEXUS_PASSWORD")
-            }
-        }
-    }
-}

scripts/civgradle/gradle.properties

@@ -1 +0,0 @@
-kotlin.code.style=official

scripts/civgradle/gradle/wrapper/gradle-wrapper.properties

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

scripts/civgradle/gradlew

@@ -1,185 +0,0 @@
-#!/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
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-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.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-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.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# 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"
-
-exec "$JAVACMD" "$@"

scripts/civgradle/gradlew.bat

@@ -1,89 +0,0 @@
-@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
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-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.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-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.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

scripts/civgradle/settings.gradle.kts

@@ -1 +0,0 @@
-rootProject.name = "civgradle"

scripts/civgradle/src/main/kotlin/net/civmc/civgradle/CivGradleExtension.kt

@@ -1,20 +0,0 @@
-package net.civmc.civgradle
-
-import net.civmc.civgradle.paper.PlatformPaperExtension
-import org.gradle.api.Action
-import org.gradle.api.model.ObjectFactory
-import javax.inject.Inject
-
-open class CivGradleExtension @Inject constructor(objects: ObjectFactory) {
-
-    var repoOwner = "CivMC"
-    var pluginName = ""
-
-    val paper: PlatformPaperExtension = objects.newInstance(PlatformPaperExtension::class.java)
-
-    @Suppress("unused")
-    fun paper(action: Action<PlatformPaperExtension>) {
-        action.execute(paper)
-    }
-}
-

scripts/civgradle/src/main/kotlin/net/civmc/civgradle/CivGradlePlugin.kt

@@ -1,28 +0,0 @@
-package net.civmc.civgradle
-
-import net.civmc.civgradle.common.PlatformCommon
-import net.civmc.civgradle.paper.PlatformPaper
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-@Suppress("unused")
-abstract class CivGradlePlugin : Plugin<Project> {
-
-    private val logger: Logger = LoggerFactory.getLogger(CivGradlePlugin::class.java)
-
-    override fun apply(project: Project) {
-        val extension = project.extensions.create("civGradle", CivGradleExtension::class.java)
-
-        project.beforeEvaluate {
-            PlatformCommon.beforeEvaluate(project, extension)
-            PlatformPaper.beforeEvaluate(project, extension)
-        }
-
-        project.afterEvaluate {
-            PlatformCommon.afterEvaluate(project, extension)
-            PlatformPaper.afterEvaluate(project, extension)
-        }
-    }
-}

scripts/civgradle/src/main/kotlin/net/civmc/civgradle/common/PlatformCommon.kt

@@ -1,145 +0,0 @@
-package net.civmc.civgradle.common
-
-import com.gradle.enterprise.gradleplugin.GradleEnterpriseExtension
-import net.civmc.civgradle.CivGradleExtension
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.api.tasks.javadoc.Javadoc
-import org.gradle.api.tasks.testing.Test
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.language.jvm.tasks.ProcessResources
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import java.net.URI
-
-object PlatformCommon {
-
-    private val logger: Logger = LoggerFactory.getLogger(PlatformCommon::class.java)
-
-    private var enterpriseEnabled = false
-
-    fun beforeEvaluate(project: Project, extension: CivGradleExtension) {
-        project.gradle.settingsEvaluated {
-            if (it.pluginManager.hasPlugin("com.gradle.enterprise")) {
-                enterpriseEnabled = true
-            }
-        }
-    }
-
-    fun afterEvaluate(project: Project, extension: CivGradleExtension) {
-        if (project.pluginManager.hasPlugin("java-library")) {
-            logger.debug("Configuring Java")
-            configureJava(project)
-        }
-
-        if(project.pluginManager.hasPlugin("maven-publish")) {
-            logger.debug("Configuring Maven Publish")
-            configureMavenPublish(project, extension)
-        }
-
-        if (enterpriseEnabled) {
-            logger.debug("Configuring Gradle Enterprise")
-            configureGradleEnterprise(project, extension)
-        }
-    }
-
-    /**
-     * Configure our project to use java 17 UTF_8 for everything
-     */
-    private fun configureJava(project: Project) {
-        val javaExtension = project.extensions.getByType(JavaPluginExtension::class.java)
-
-        javaExtension.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
-        javaExtension.withJavadocJar()
-        javaExtension.withSourcesJar()
-
-        project.tasks.withType(JavaCompile::class.java) {
-            it.options.encoding = Charsets.UTF_8.name()
-            it.options.release.set(17)
-        }
-
-        project.tasks.withType(Javadoc::class.java) {
-            it.options.encoding = Charsets.UTF_8.name()
-        }
-
-        project.tasks.withType(ProcessResources::class.java) {
-            it.filteringCharset = Charsets.UTF_8.name()
-        }
-
-        project.tasks.withType(Test::class.java) { testing ->
-            testing.useJUnitPlatform()
-            testing.testLogging { logging ->
-                logging.events(*TestLogEvent.values())
-                logging.exceptionFormat = TestExceptionFormat.FULL
-                logging.showCauses = true
-                logging.showExceptions = true
-                logging.showStackTraces = true
-            }
-        }
-
-        logger.debug("Java tasks configured")
-    }
-
-    private fun configureMavenPublish(project: Project, extension: CivGradleExtension) {
-        val publishingExtension = project.extensions.getByType(PublishingExtension::class.java)
-
-        val githubActor = System.getenv("GITHUB_ACTOR")
-        val githubToken = System.getenv("GITHUB_TOKEN")
-
-        val nexusUser = System.getenv("CIVMC_NEXUS_USER")
-        val nexusPassword = System.getenv("CIVMC_NEXUS_PASSWORD")
-
-        publishingExtension.repositories {
-            if (!githubActor.isNullOrEmpty() && !githubToken.isNullOrEmpty()) {
-                it.maven {
-                    it.name = "GitHubPackages"
-                    it.url = URI("https://maven.pkg.github.com/${extension.repoOwner}/${extension.pluginName}")
-                    it.credentials {
-                        it.username = githubActor
-                        it.password = githubToken
-                    }
-                }
-            }
-
-            if (!nexusUser.isNullOrEmpty() && !nexusPassword.isNullOrEmpty()) {
-                val targetRepo = if (project.version.toString().endsWith("SNAPSHOT"))
-                    "maven-snapshots"
-                else
-                    "maven-releases"
-
-                it.maven {
-                    it.name = "CivMC"
-                    it.url = URI("https://repo.civmc.net/repository/$targetRepo")
-                    it.credentials {
-                        it.username = nexusUser
-                        it.password = nexusPassword
-                    }
-                }
-            }
-        }
-
-        publishingExtension.publications {
-            it.register("maven", MavenPublication::class.java) {
-                it.from(project.components.getByName("java"))
-            }
-        }
-    }
-
-    private fun configureGradleEnterprise(project: Project, extension: CivGradleExtension) {
-        val enterpriseExtension = project.extensions.getByType(GradleEnterpriseExtension::class.java)
-
-        enterpriseExtension.buildScan {
-            if (!System.getenv("CI").isNullOrEmpty()) {
-               it.tag("CI")
-                it.termsOfServiceUrl = "https://gradle.com/terms-of-service"
-                it.termsOfServiceAgree = "yes"
-            }
-        }
-    }
-}

scripts/civgradle/src/main/kotlin/net/civmc/civgradle/paper/PlatformPaper.kt

@@ -1,38 +0,0 @@
-package net.civmc.civgradle.paper
-
-import net.civmc.civgradle.CivGradleExtension
-import org.gradle.api.Project
-import org.gradle.language.jvm.tasks.ProcessResources
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import xyz.jpenilla.runpaper.task.RunServer
-
-object PlatformPaper {
-
-    private val logger: Logger = LoggerFactory.getLogger(PlatformPaper::class.java)
-
-    fun beforeEvaluate(project: Project, extension: CivGradleExtension) {
-        if (project.pluginManager.hasPlugin("xyz.jpenilla.run-paper")) {
-            logger.debug("Configuring run-paper")
-
-            project.tasks.withType(RunServer::class.java) { server ->
-                server.minecraftVersion("1.18")
-            }
-        }
-    }
-
-    fun afterEvaluate(project: Project, extension: CivGradleExtension) {
-        if (project.pluginManager.hasPlugin("io.papermc.paperweight.userdev")) {
-            logger.debug("Configuring paperweight")
-
-            project.tasks.withType(ProcessResources::class.java) {
-                it.filesMatching("plugin.yml") {
-                    it.expand(mapOf(
-                        "name" to extension.pluginName,
-                        "version" to project.version
-                    ))
-                }
-            }
-        }
-    }
-}

scripts/civgradle/src/main/kotlin/net/civmc/civgradle/paper/PlatformPaperExtension.kt

@@ -1,10 +0,0 @@
-
-package net.civmc.civgradle.paper
-
-import org.gradle.api.model.ObjectFactory
-import javax.inject.Inject
-
-@Suppress("unused_parameter")
-open class PlatformPaperExtension @Inject constructor(objects: ObjectFactory) {
-
-}

scripts/gradle/common.gradle

@@ -0,0 +1,87 @@
+
+pluginManager.withPlugin("java-library") {
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+        withSourcesJar()
+        withJavadocJar()
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = "UTF-8"
+        options.release = 17
+    }
+
+    tasks.withType(ProcessResources).configureEach {
+        filteringCharset = "UTF-8"
+    }
+
+    // TODO
+//    tasks.withType(Test).configureEach {
+//        useJUnitPlatform()
+//        testLogging {
+//            events(*TestLogEvent.values())
+//            exceptionFormat = TestExceptionFormat.FULL
+//            showCauses = true
+//            showExceptions = true
+//            showStackTraces = true
+//        }
+//    }
+}
+
+pluginManager.withPlugin("maven-publish") {
+    def githubActor = System.getenv("GITHUB_ACTOR")
+    def githubToken = System.getenv("GITHUB_TOKEN")
+    def nexusUser = System.getenv("CIVMC_NEXUS_USER")
+    def nexusPassword = System.getenv("CIVMC_NEXUS_PASSWORD")
+
+    publishing {
+        repositories {
+            if (githubActor && githubToken) {
+                maven {
+                    name = "GitHubPackages"
+                    url = URI("https://maven.pkg.github.com/CivMC/Civ")
+                    credentials {
+                        username = githubActor
+                        password = githubToken
+                    }
+                }
+            }
+
+            if (nexusUser && nexusPassword) {
+                def targetRepo = project.version.toString().endsWith("SNAPSHOT") ?
+                    "maven-snapshots"
+                :
+                    "maven-releases"
+
+                maven {
+                    name = "CivMC"
+                    url = URI("https://repo.civmc.net/repository/$targetRepo")
+                    credentials {
+                        username = nexusUser
+                        password = nexusPassword
+                    }
+                }
+            }
+        }
+
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+            }
+        }
+    }
+}
+
+pluginManager.withPlugin("com.gradle.enterprise") {
+    gradleEnterprise {
+        buildScan {
+            if (System.getenv("CI")) {
+                it.tag("CI")
+                it.termsOfServiceUrl = "https://gradle.com/terms-of-service"
+                it.termsOfServiceAgree = "yes"
+            }
+        }
+    }
+}

scripts/gradle/paper.gradle

@@ -0,0 +1,22 @@
+
+pluginManager.withPlugin("xyz.jpenilla.run-paper") {
+    tasks {
+        runServer {
+            minecraftVersion("1.18")
+        }
+    }
+}
+
+pluginManager.withPlugin("io.papermc.paperweight.userdev") {
+    tasks {
+        processResources {
+            filesMatching("plugin.yml") {
+                expand project.properties
+            }
+        }
+    }
+
+    build {
+        dependsOn(reobfJar)
+    }
+}