MV5

.github/workflows/generic.checkstyle.yml

@@ -8,11 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      pull-requests: write
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v3
 
       - uses: dbelyaev/[email protected]
+        continue-on-error: true
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_version: 10.12.2
           checkstyle_config: ./config/mv_checks.xml
+          level: warning

.github/workflows/generic.github_release.yml

@@ -49,7 +49,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 

.github/workflows/generic.test.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 

build.gradle

@@ -1,16 +1,33 @@
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.gradleup.shadow' version '8.3.5'
+    id "org.jetbrains.kotlin.jvm" version "2.0.21"
 }
 
 version = System.getenv('GITHUB_VERSION') ?: 'local'
-group = 'com.onarandombox.multiversecore'
+group = 'org.mvplugins.multiverse.core'
 description = 'Multiverse-Core'
 
-java.sourceCompatibility = JavaVersion.VERSION_11
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileTestJava {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+compileTestKotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+        javaParameters.set(true)
+    }
+}
 
 repositories {
     mavenLocal()
@@ -39,37 +56,106 @@ repositories {
     maven {
         url = uri('https://repo.maven.apache.org/maven2/')
     }
+
+    maven {
+        name = 'aikar repo'
+        url = uri('https://repo.aikar.co/content/groups/aikar/')
+    }
+
+    maven {
+        name = 'glaremasters repo'
+        url = 'https://repo.glaremasters.me/repository/towny/'
+    }
+
+    maven {
+        name = "helpchatRepoReleases"
+        url = uri("https://repo.helpch.at/releases/")
+    }
+
+    maven {
+        name = 'papermc repo'
+        url = 'https://repo.papermc.io/repository/maven-public/'
+    }
+}
+
+configurations {
+    // Add configuration for server API
+    compileOnly.extendsFrom serverApi
+    runtimeClasspath.extendsFrom serverApi
+
+    // Add configuration for external plugins
+    implementation.extendsFrom externalPlugin
+
+    // Add configuration for dependencies that will be included in fat jar
+    compileClasspath.extendsFrom shadowed
+    testCompileClasspath.extendsFrom shadowed
+    testRuntimeClasspath.extendsFrom shadowed
+    oldTestCompileClasspath.extendsFrom shadowed
+    oldTestRuntimeClasspath.extendsFrom shadowed
+
+    // Add configuration for old tests
+    oldTestImplementation.extendsFrom implementation
+    oldTestRuntime.extendsFrom runtime
 }
 
 dependencies {
-    implementation 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
+    serverApi 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT'
 
-    implementation('com.github.MilkBowl:VaultAPI:1.7') {
+    // Economy
+    externalPlugin('com.github.MilkBowl:VaultAPI:1.7.1') {
         exclude group: 'org.bukkit', module: 'bukkit'
     }
 
-    compileOnly('me.main__.util:SerializationConfig:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
+    // PlaceholderAPI
+    externalPlugin 'me.clip:placeholderapi:2.11.6'
+
+    // Command Framework
+    shadowed 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
+
+    // Config
+    shadowed('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.1') {
+        exclude group: 'org.spigotmc', module: 'spigot-api'
     }
-    compileOnly('com.pneumaticraft.commandhandler:CommandHandler:11') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-        exclude group: 'junit', module: 'junit'
+
+    // Utils
+    shadowed 'io.vavr:vavr:0.10.4'
+    shadowed 'org.glassfish.hk2:hk2-locator:3.0.3'
+    shadowed('org.glassfish.hk2:hk2-inhabitant-generator:3.0.3') {
+        exclude group: 'org.apache.maven', module: 'maven-core'
     }
-    compileOnly 'com.dumptruckman.minecraft:buscript:2.0-SNAPSHOT'
-    compileOnly 'org.bstats:bstats-bukkit:2.2.1'
-    compileOnly('com.dumptruckman.minecraft:Logging:1.1.1') {
+    shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
-    compileOnly 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
-    compileOnly 'org.jetbrains:annotations:16.0.2'
+    shadowed 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
+    shadowed('org.bstats:bstats-bukkit:3.1.0') {
+        exclude group: 'org.bukkit', module: 'bukkit'
+    }
+    shadowed 'net.minidev:json-smart:2.4.9'
+    shadowed 'org.jetbrains:annotations:22.0.0'
+    shadowed 'io.papermc:paperlib:1.0.8'
 
-    testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
+    // Tests
+    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21'
+    testImplementation 'org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.24.1'
     testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'commons-io:commons-io:2.4'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test'
+    testImplementation 'com.natpryce:hamkrest:1.8.0.1'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0'
+
+    // Old Tests
+    oldTestImplementation 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
+    oldTestImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
+    oldTestImplementation 'junit:junit:4.13.1'
+    oldTestImplementation 'org.mockito:mockito-core:3.11.2'
+    oldTestImplementation 'commons-io:commons-io:2.7'
+
+    // Annotation Processors
+    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
+    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
 }
 
 
@@ -78,11 +164,11 @@ java {
     withJavadocJar()
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
-tasks.withType(Javadoc) {
+tasks.withType(Javadoc).configureEach {
     options.encoding = 'UTF-8'
 }
 
@@ -92,28 +178,52 @@ configurations {
         it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
         it.outgoing.artifact(shadowJar)
     }
+}
 
-    testCompileOnly.extendsFrom compileOnly
-    testRuntimeOnly.extendsFrom testCompileOnly
 
-    shadowed.extendsFrom compileOnly {
-        canBeResolved = true
+sourceSets {
+    oldTest {
+        java {
+            compileClasspath += main.output
+            runtimeClasspath += main.output
+            srcDir file('src/old-test/java')
+        }
+        resources.srcDir file('src/old-test/resources')
     }
 }
 
+
 publishing {
     publications {
         maven(MavenPublication) {
             from components.java
 
             pom.withXml {
-                asNode().dependencies.'*'.findAll() {
-                    it.scope.text() == 'runtime'  && project.configurations.implementation.allDependencies.find { dep ->
-                        dep.name == it.artifactId.text()
-                    }
+                Node pomNode = asNode()
+
+                // Remove Kotlin dependency
+                pomNode.dependencies.'*'.findAll() {
+                    it.groupId.text() == 'org.jetbrains.kotlin'
+                }.each() {
+                    it.parent().remove(it)
+                }
+
+                // Switch runtime deps to provided
+                pomNode.dependencies.'*'.findAll() {
+                    it.scope.text() == 'runtime'
                 }.each() {
                     it.scope*.value = 'provided'
                 }
+
+                // Add spigot api to pom
+                project.configurations.serverApi.allDependencies.each { dependency ->
+                    pomNode.dependencies[0].appendNode("dependency").with {
+                        it.appendNode("groupId", dependency.group)
+                        it.appendNode("artifactId", dependency.name)
+                        it.appendNode("version", dependency.version)
+                        it.appendNode("scope", "provided")
+                    }
+                }
             }
         }
     }
@@ -133,6 +243,13 @@ publishing {
             url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
             credentials(PasswordCredentials)
         }
+
+        maven {
+            // todo: remove before mv5 release
+            name = "multiverseBeta"
+            url = "https://repo.c0ding.party/multiverse-beta"
+            credentials(PasswordCredentials)
+        }
     }
 }
 
@@ -151,6 +268,19 @@ task prepareSource(type: Sync) {
 compileJava {
     source = prepareSource.outputs
 }
+tasks.withType(JavaCompile) {
+    configure(options) {
+        options.compilerArgs << '-Aorg.glassfish.hk2.metadata.location=META-INF/hk2-locator/Multiverse-Core'
+    }
+}
+
+compileKotlin {
+    // We're not using Kotlin in the plugin itself, just tests!
+    enabled = false
+}
+configurations.findAll { !it.name.startsWith('test') }.each {
+    it.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
 
 processResources {
     def props = [version: "${project.version}"]
@@ -175,20 +305,45 @@ javadoc {
 project.configurations.api.canBeResolved = true
 
 shadowJar {
-    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
-    relocate 'com.pneumaticraft.commandhandler', 'com.onarandombox.commandhandler'
-    relocate 'buscript', 'com.onarandombox.buscript'
-    relocate 'org.bstats', 'com.onarandombox.bstats'
-    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
-    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
-    relocate 'org.codehaus.jettison', 'com.onarandombox.jettison'
-    relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter'
+    relocate 'co.aikar', 'org.mvplugins.multiverse.external.acf'
+    relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.core.utils.CoreLogging'
+    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.core.utils.DebugFileLogger'
+    relocate 'de.themoep.idconverter', 'org.mvplugins.multiverse.external.idconverter'
+    relocate 'io.github.townyadvanced.commentedconfiguration', 'org.mvplugins.multiverse.external.commentedconfiguration'
+    relocate 'me.main__.util', 'org.mvplugins.multiverse.external.serializationconfig'
+    relocate 'org.bstats', 'org.mvplugins.multiverse.external.bstats'
+    relocate 'com.sun', 'org.mvplugins.multiverse.external.sun'
+    relocate 'net.minidev', 'org.mvplugins.multiverse.external.minidev'
+    relocate 'org.objectweb', 'org.mvplugins.multiverse.external.objectweb'
+    relocate 'io.vavr', 'org.mvplugins.multiverse.external.vavr'
+    relocate 'jakarta', 'org.mvplugins.multiverse.external.jakarta'
+    relocate 'javassist', 'org.mvplugins.multiverse.external.javassist'
+    relocate 'org.aopalliance', 'org.mvplugins.multiverse.external.aopalliance'
+    relocate 'org.glassfish', 'org.mvplugins.multiverse.external.glassfish'
+    relocate 'org.jvnet', 'org.mvplugins.multiverse.external.jvnet'
+    relocate 'org.intellij', 'org.mvplugins.multiverse.external.intellij'
+    relocate 'org.jetbrains', 'org.mvplugins.multiverse.external.jetbrains'
+    relocate 'io.papermc.lib', 'org.mvplugins.multiverse.external.paperlib'
 
     configurations = [project.configurations.shadowed]
 
-    archiveFileName = "$baseName-$version.$extension"
-    classifier = ''
+    archiveClassifier.set('')
+
+    dependencies {
+        exclude(dependency {
+            it.moduleGroup == 'org.jetbrains.kotlin'
+        })
+    }
+    //classifier = ''
 }
 
 build.dependsOn shadowJar
 jar.enabled = false
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        exceptionFormat = 'full'
+    }
+}