Skip to content

Commit ee3e3df

Browse files
committed
Filter out scala synthetic classes from annotation cache to prevent duplicae data.
1 parent 4a7d623 commit ee3e3df

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

src/main/java/net/minecraftforge/gradle/tasks/TaskExtractAnnotationsText.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,12 @@
1919
*/
2020
package net.minecraftforge.gradle.tasks;
2121

22-
import java.io.BufferedOutputStream;
2322
import java.io.File;
24-
import java.io.FileOutputStream;
2523
import java.io.IOException;
2624
import java.util.Collections;
27-
import java.util.Date;
2825
import java.util.Map;
2926
import java.util.zip.ZipEntry;
3027
import java.util.zip.ZipFile;
31-
import java.util.zip.ZipOutputStream;
32-
3328
import org.gradle.api.DefaultTask;
3429
import org.gradle.api.tasks.InputFile;
3530
import org.gradle.api.tasks.OutputFile;
@@ -41,7 +36,6 @@
4136
import com.google.gson.Gson;
4237
import com.google.gson.GsonBuilder;
4338

44-
import net.minecraftforge.gradle.common.Constants;
4539
import net.minecraftforge.gradle.util.AnnotationUtils;
4640
import net.minecraftforge.gradle.util.AnnotationUtils.ASMInfo;
4741
import net.minecraftforge.gradle.util.AnnotationUtils.Annotation;
@@ -98,6 +92,8 @@ public void doTask() throws IOException
9892
// correct source name
9993
if (e.getName().endsWith(".class"))
10094
{
95+
if (e.getName().endsWith("$.class")) //Scala synthetic class, skip
96+
continue;
10197
byte[] data = ByteStreams.toByteArray(in.getInputStream(e));
10298
ASMInfo info = AnnotationUtils.processClass(data);
10399
if (info != null)

0 commit comments

Comments
 (0)