Update to Java 17, remove Sponge temporarily

Author: Fernthedev

.github/workflows/gradle.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.11
+    - name: Set up JDK 1.17
       uses: actions/setup-java@v1.4.3
       with:
-        java-version: 1.11
+        java-version: 1.17
     - name: Change wrapper permissions
       run: chmod +x ./gradlew
     - name: Build with Gradle

all/build.gradle

@@ -3,7 +3,6 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' // version '1.3.61'
 }
 
-sourceCompatibility = 1.8
 archivesBaseName = "all"
 
 repositories {
@@ -12,18 +11,14 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.13.1'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 
-    compile project(':core')
-    compile project(':bungee')
-    compile project(':spigot')
-    compile project(":sponge")
-    compile project(":velocity")
-}
+    implementation project(':core')
+    implementation project(':bungee')
+    implementation project(':spigot')
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    if (projects.any { it.name == "sponge" }) {
+        implementation project(":sponge")
+    }
+    implementation project(":velocity")
 }

build.gradle

@@ -1,24 +1,9 @@
-buildscript {
-    ext.kotlin_version = '1.5.21'
-    repositories {
-        jcenter()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-
-    }
-
-    dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:4.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 plugins {
     id 'java' apply true
-    id 'org.jetbrains.kotlin.jvm' version '1.5.21'
-    id 'net.nemerosa.versioning' version '2.14.0'
-    id "io.freefair.lombok" version "5.3.0"
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0'
+    id 'net.nemerosa.versioning' version '2.15.1'
+    id "io.freefair.lombok" version "6.3.0"
+    id 'com.github.johnrengelman.shadow' version '7.1.0'
     id 'signing'
     id 'maven-publish'
 }
@@ -31,14 +16,10 @@ apply plugin: 'kotlin'
 
 archivesBaseName = "FernAPI"
 
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-}
-
 
 allprojects {
     apply plugin: 'java'
+    apply plugin: 'kotlin'
 //    apply plugin: 'maven'
     apply plugin: 'com.github.johnrengelman.shadow'
     apply plugin: 'maven-publish'
@@ -50,8 +31,8 @@ allprojects {
 //    version = versioning.info.full
     ext.buildVer = "1.9.0"
     ext.aikarVer = "0.5.0-SNAPSHOT"
-    ext.adventureAPI = "4.8.1"
-    ext.adventureAPIPlatform = "4.0.0-SNAPSHOT"
+    ext.adventureAPI = "4.9.3"
+    ext.adventureAPIPlatform = "4.0.0"
     ext.slf4j_ver = "1.7.30"
     project.ext.beta_version = '4' // Only modify when beta
     ext.beta_prefix = 'rc'
@@ -76,11 +57,11 @@ allprojects {
         full = {
             scmInfo ->
 
-                GString suffix = "${scmInfo.branch}"
+                String suffix = "${scmInfo.branch}"
 
                 if (suffix == 'beta') suffix += "${project.beta_version}"
 
-                GString num = scmInfo.tag != null ? "${scmInfo.tag}" : "${scmInfo.abbreviated}.h-${suffix}"
+                String num = scmInfo.tag != null ? "${scmInfo.tag}" : "${scmInfo.abbreviated}.h-${suffix}"
 
                 return "${num}"
 
@@ -129,7 +110,7 @@ allprojects {
     }
 
 
-    GString tagVer = "${buildVer}${beta_prefix}${project.beta_version}"
+    String tagVer = "${buildVer}${beta_prefix}${project.beta_version}"
     // If being worked on
     version = versioning.info.tag != null ? versioning.info.tag : "v${tagVer}-${versioning.info.branch}-${versioning.info.build}"
 
@@ -141,6 +122,7 @@ allprojects {
 
         from(sourceSets.main.resources.srcDirs) {
             include 'fernapi_version.json'
+            duplicatesStrategy = DuplicatesStrategy.WARN;
 
 
             expand 'fernapi_version': project.version
@@ -159,7 +141,6 @@ allprojects {
             url "https://libraries.minecraft.net"
         }
 
-        jcenter()
         maven { url "https://jitpack.io" }
         mavenCentral()
         maven {
@@ -174,29 +155,36 @@ allprojects {
         implementation fileTree(include: ['*.jar'], dir: 'libs')
 
         api "net.kyori:adventure-api:$adventureAPI"
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
-        compile group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1u2'
-
-//        compileOnly 'org.projectlombok:lombok:1.18.12'
-//        annotationProcessor 'org.projectlombok:lombok:1.18.12'
+        api "net.kyori:adventure-text-serializer-legacy:$adventureAPI"
+        implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1u2'
     }
 
-    sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+//    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 
     compileJava {
-        sourceCompatibility = targetCompatibility = '1.8'
+        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
         options.compilerArgs += ["-parameters"]
         options.fork = true
         options.forkOptions.executable = 'javac'
     }
 
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = "utf-8"
+
+        if (JavaVersion.current().isJava10Compatible()) {
+            options.release.set(17)
+        }
+    }
+
     compileKotlin {
         kotlinOptions.javaParameters = true
+        kotlinOptions.jvmTarget = sourceCompatibility
     }
 
     shadowJar {
         minimize()
+        mergeServiceFiles()
         relocate 'co.aikar.commands', "${project.group}.acf"
         relocate 'co.aikar.locales', "${project.group}.locales"
         relocate 'co.aikar.idb', "${project.group}.idb"
@@ -289,7 +277,7 @@ allprojects {
 configure(subprojects.findAll {it.name != 'core'}) {
     afterEvaluate {
         dependencies {
-            compile(project(':core'))
+            implementation(project(':core'))
         }
     }
 }
@@ -306,90 +294,3 @@ configure(subprojects.findAll {it.name != 'all'}) {
         }
     }
 }
-
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-}
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-//
-//repositories {
-//    maven {
-//        name = 'spigotmc-repo'
-//        url = 'https://hub.spigotmc.org/nexus/content/groups/public/'
-//    }
-//
-//    maven {
-//        name = 'sonatype'
-//        url = 'https://oss.sonatype.org/content/groups/public/'
-//    }
-//
-//
-//    maven {
-//        name = 'placeholderapi'
-//        url = 'http://repo.extendedclip.com/content/repositories/placeholderapi/'
-//    }
-//
-//    maven {
-//        name 'velocity'
-//        url 'https://repo.velocitypowered.com/snapshots/'
-//    }
-//
-//    flatDir {
-//        dirs 'libs'
-//    }
-//
-//    jcenter()
-//    maven { url "https://jitpack.io" }
-//    mavenCentral()
-//}
-
-
-
-
-
-
-
-//
-//dependencies {
-//    implementation fileTree(include: ['*.jar'], dir: 'libs')
-//    compileOnly 'com.google.code.gson:gson:2.6.2'
-//    //compileOnly 'org.spigotmc:spigot-api:1.8-R0.1-SNAPSHOT'
-//    compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
-//    compileOnly 'net.md-5:bungeecord-api:1.14-SNAPSHOT'
-//    compileOnly group: 'me.clip', name: 'placeholderapi', version: '2.9.2'
-//    compileOnly 'org.spongepowered:spongeapi:7.1.0'
-//    compileOnly 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT'
-//    annotationProcessor 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT'
-////    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
-//    compile 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
-//    compile 'com.github.Fernthedev:fern-configmanager:1.1.2' // Check github releases tag for the version.
-//
-//    compileOnly ('com.github.Fernthedev:VaultAPI:7.0') {
-//        exclude group: 'org.bukkit'
-//    }
-//    // 2. Use Guava types in your public API:
-//    compile("com.google.guava:guava:28.1-jre")
-////
-//    compileOnly 'org.projectlombok:lombok:1.18.8'
-//    annotationProcessor 'org.projectlombok:lombok:1.18.8'
-//
-//
-////    implementation 'com.google.guava:guava:22.0'
-//}
-
-
-

bungee/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm'// version '1.4.32'
 }
-sourceCompatibility = 1.8
 archivesBaseName = "bungee"
 
 repositories {
@@ -16,14 +15,5 @@ repositories {
 dependencies {
     implementation "net.kyori:adventure-platform-bungeecord:$adventureAPIPlatform"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.13.1'
-    compileOnly 'net.md-5:bungeecord-api:1.16-R0.3'
+    compileOnly 'net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT'
 }
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-

bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/BungeeInterface.java

@@ -14,6 +14,7 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -120,7 +121,7 @@ public OfflineFPlayer<ProxiedPlayer> getPlayerFromName(String name) {
     }
 
     @Override
-    public OfflineFPlayer<ProxiedPlayer> getPlayerFromUUID(UUID uuid) {
+    public @NotNull OfflineFPlayer<ProxiedPlayer> getPlayerFromUUID(UUID uuid) {
         ProxiedPlayer player = fernBungeeAPI.getProxy().getPlayer(uuid);
 
         Universal.debug(() ->"Player uuid " + uuid + " for player " + player);
@@ -167,7 +168,7 @@ public List<IFPlayer<ProxiedPlayer>> matchPlayerName(String name) {
         return getPlayers()
                 .parallelStream()
                 .filter(proxiedPlayerIFPlayer -> proxiedPlayerIFPlayer.getName().contains(name))
-                .collect(Collectors.toList());
+                .toList();
     }
 
 

bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/interfaces/BungeePluginData.java

@@ -5,7 +5,6 @@
 import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
 import com.github.fernthedev.fernapi.universal.handlers.MethodInterface;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import net.md_5.bungee.api.plugin.PluginDescription;
 import org.jetbrains.annotations.NotNull;
@@ -16,12 +15,14 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-@RequiredArgsConstructor
 public class BungeePluginData implements PluginData<PluginDescription> {
 
     @NonNull
     private final PluginDescription bungeePluginData;
 
+    public BungeePluginData(@NonNull PluginDescription bungeePluginData) {
+        this.bungeePluginData = bungeePluginData;
+    }
 
     /**
      * @return the server specific instance. Use for checking equality or getting server-specific data