hmmmm maybe not supposed to include these bin folders, ..... guess we'll find out later

client: snake is back on the menu boys

build.gradle.kts

@@ -23,33 +23,32 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.ajoberstar.grgit.Grgit
+import java.io.BufferedReader
+import java.io.InputStreamReader
 
 buildscript {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven(url = "https://raw.githubusercontent.com/open-osrs/hosting/master")
+        mavenCentral()
     }
     dependencies {
-        classpath("org.ajoberstar.grgit:grgit-core:4.1.0")
-        classpath("com.openosrs:script-assembler-plugin:1.0.0")
-        classpath("com.openosrs:injector-plugin:2.0.1")
     }
 }
 
 plugins {
-    id("org.ajoberstar.grgit") version "4.1.0"
-
     application
 }
 
 val localGitCommit: String = try {
-    val projectPath = rootProject.projectDir.absolutePath
-    Grgit.open(mapOf("dir" to projectPath)).head().id
-} catch (_: Exception) {
-    "n/a"
-}
+    val proc = ProcessBuilder("git", "rev-parse", "HEAD")
+        .directory(rootProject.projectDir)
+        .redirectErrorStream(true)
+        .start()
+    proc.waitFor()
+    BufferedReader(InputStreamReader(proc.inputStream)).readText().trim()
+        .ifEmpty { "n/a" }
+} catch (_: Exception) { "n/a" }
 
 allprojects {
     group = "com.openosrs"
@@ -142,8 +141,8 @@ subprojects {
 
     tasks {
         java {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_21
+            targetCompatibility = JavaVersion.VERSION_21
         }
 
         withType<AbstractArchiveTask> {
@@ -165,7 +164,7 @@ subprojects {
             exclude("**/RoomType.java")
         }
 
-        /*withType<Jar> {
+        withType<Jar> {
             doLast {
                 // sign jar
                 if (System.getProperty("signKeyStore") != null) {
@@ -187,7 +186,7 @@ subprojects {
                     }
                 }
             }
-        }*/
+        }
     }
 
     configurations.compileOnly.get().extendsFrom(configurations["annotationProcessor"])

buildSrc/build.gradle.kts

@@ -29,11 +29,12 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven(url = "https://raw.githubusercontent.com/open-osrs/hosting/master")
 }
 
 dependencies {
     implementation(gradleApi())
-    implementation(group = "net.runelite", name = "fernflower", version = "07082019")
+    // Switch from the old net.runelite fernflower (no longer hosted)
+    // to the maintained Vineflower fork which provides the same API.
+    implementation(group = "org.vineflower", name = "vineflower", version = "1.11.1")
     implementation(group = "org.json", name = "json", version = "20190722")
-}
+}

buildSrc/src/main/kotlin/BootstrapTask.kt

@@ -155,8 +155,6 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT
                     it.file.name.contains("runelite-api") ||
                     it.file.name.contains("runelite-jshell")) {
                 path = "https://github.com/open-osrs/hosting/raw/master/${type}/${it.file.name}"
-            } else if (it.file.name.contains("injection-annotations")) {
-                path = "https://github.com/open-osrs/hosting/raw/master/" + group.replace(".", "/") + "/${name}/$version/${it.file.name}"
             } else if (!group.contains("runelite")) {
                 path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version"
                 if (it.classifier != null && it.classifier != "no_aop") {

buildSrc/src/main/kotlin/Dependencies.kt

@@ -29,8 +29,8 @@ object ProjectVersions {
 
     const val openosrsVersion = "4.31.2"
 
-    const val rsversion = 206
+    const val rsversion = 233
     const val cacheversion = 165
 
-    const val lombokVersion = "1.18.20"
+    const val lombokVersion = "1.18.34"
 }