Reunify AP

annotation-processor-unshadow/build.gradle

@@ -1,27 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'com.diffplug.spotless'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'com.google.guava:guava:21.0'
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
-    implementation project(path: ":annotation-processor")
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs += '--enable-preview'
-}
-
-spotless {
-    java {
-        removeUnusedImports()
-    }
-}
-version = '1.1.2'

annotation-processor/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'com.github.johnrengelman.shadow'
     id 'java-library'
     id 'com.diffplug.spotless'
 }
@@ -10,11 +11,18 @@ repositories {
 }
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
+
     implementation 'com.google.code.gson:gson:2.10.1'
+    shadow 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.auto:auto-common:1.2.1'
-    // Platform classes
+    shadow 'com.google.auto:auto-common:1.2.1'
-//    "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation 'com.google.guava:guava:21.0'
+    shadow 'com.google.guava:guava:21.0'
+
     implementation project(":annotations")
+    shadow project(":annotations")
 }
 
 tasks.withType(JavaCompile) {
@@ -22,6 +30,10 @@ tasks.withType(JavaCompile) {
     options.release = 17
 }
 
+shadowJar {
+    include 'META-INF/services/javax.annotation.processing.Processor'
+}
+
 spotless {
     java {
         removeUnusedImports()

buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle

@@ -17,7 +17,7 @@ dependencies {
         }
     }
     implementation project(":annotations")
-    annotationProcessor project(":annotation-processor-unshadow")
+    annotationProcessor project(path: ":annotation-processor", configuration: 'shadow')
 }
 
 project.sourceSets {

settings.gradle

@@ -15,7 +15,6 @@ pluginManagement {
 }
 
 include("annotation-processor")
-include("annotation-processor-unshadow")
 include("annotations")
 include("test_agent")
 include("common")