[1.17.1-] Fix Guava version, drop Forge support

Guice 6.0.0 needs Guava 31, Minecraft 1.17.1 uses an older Guava version. Fabric can bundle the newer version of Guava and resolve the dependency correctly. Forge's JiJ system does not actually support 1.17.1, and Shadowing this Guava version will conflict with the base game and crash, forcing us to either downgrade the project to 5.1.0 and make porting a pain, or remain on 6.0.0+ and drop Forge for these versions.

Author: The-Fireplace

README.md

@@ -17,4 +17,4 @@ See [Getting Started](https://github.com/The-Fireplace-Minecraft-Mods/Annotated-
 ## Current Target Game Versions
 New releases are not planned to occur outside of these version ranges. Existing versions outside these ranges may still function, but are no longer supported.
 - Fabric: Minecraft 1.14 - Current
-- Forge: Minecraft 1.15.2 - 1.20.6
+- Forge: Minecraft 1.18 - 1.20.6

changelog.txt

@@ -1 +1 @@
-Added French translation
+[1.17.1-] Fixed crash when mods attempt to use the DI system.

fabric/build.gradle

@@ -19,9 +19,10 @@ dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     modApi("com.google.inject:guice:${project.guice_version}") {
-        exclude(group: 'com.google.guava')
     }
     include "com.google.inject:guice:${project.guice_version}"
+    include 'com.google.guava:guava:31.0.1-jre'
+    include 'com.google.guava:failureaccess:1.0.3'
     include 'javax.inject:javax.inject:1'
     include 'jakarta.inject:jakarta.inject-api:2.0.1'
     include 'aopalliance:aopalliance:1.0'

forge/build.gradle

@@ -8,6 +8,8 @@ buildscript {
 plugins {
     id 'java'
     id 'java-library'
+    //id 'com.gradleup.shadow' version '9.0.0-beta15'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
     // Mod Hosting Publish
     id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -25,23 +27,28 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    api("com.google.inject:guice:${project.guice_version}") {
+    api("com.google.inject:guice:5.1.0") {
         exclude(group: 'com.google.guava')
     }
-
-    jarJar("com.google.inject:guice:[${project.guice_version}]") {
+    shadow("com.google.inject:guice:5.1.0") {
         exclude(group: 'com.google.guava')
     }
-    jarJar 'javax.inject:javax.inject:[1]'
-    jarJar 'jakarta.inject:jakarta.inject-api:[2.0.1]'
-    jarJar 'aopalliance:aopalliance:[1.0]'
+    shadow 'javax.inject:javax.inject:[1]'
+    shadow 'aopalliance:aopalliance:[1.0]'
 
     compileOnly project(":common")
     annotationProcessor project(':processor-forge')
 }
 
-tasks.jarJar {
-    archiveClassifier = ''
+shadowJar {
+    archiveClassifier.set('')
+    configurations = [project.configurations.shadow]
+
+    finalizedBy 'reobfShadowJar'
+}
+
+reobf {
+    shadowJar {}
 }
 
 minecraft {
@@ -150,11 +157,12 @@ if (hasProperty('modrinthApiKey') || System.getenv("MODRINTH_API_KEY") != null)
     }
 }
 
+jar.finalizedBy('reobfJar')
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            jarJar.component(it)
             groupId project.maven_group
             artifactId project.archivesBaseName
             version project.version

gradle.properties

@@ -7,14 +7,10 @@ minecraft_version=1.16.5
 # Fabric
 fabric_loader_version=0.14.10
 fabric_curseforge_url=https://www.curseforge.com/minecraft/mc-mods/annotated-di
-# Forge
-forge_version=36.2.35
-forge_curseforge_url=https://www.curseforge.com/minecraft/mc-mods/annotated-di-forge
-forge_update_json_url=https://api.modrinth.com/updates/annotated-di/forge_updates.json
 # Mod Properties
 maven_group=dev.the-fireplace
 archives_base_name=Annotated-DI
-mod_version=4.0.6
+mod_version=4.0.7
 release_type=release
 license_id=Apache-2.0
 license_name=Apache License 2.0

processor-forge/build.gradle

@@ -13,4 +13,4 @@ pluginManagement {
 }
 
 rootProject.name = 'AnnotatedDI'
-include('common', 'processor', 'fabric', 'forge', 'processor-fabric', 'processor-forge')
+include('common', 'processor', 'fabric', 'processor-fabric')