From 8cfa1967b4aeea7b5fa75dc813e3a1a5dd40ef86 Mon Sep 17 00:00:00 2001
From: A248 <anandebeh@gmail.com>
Date: Wed, 28 Apr 2021 21:05:27 -0400
Subject: [PATCH] Simply exclude module descriptor from Eclipse compilation

---
 caffeine/build.gradle | 10 ++--------
 gradle/eclipse.gradle | 15 +--------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/caffeine/build.gradle b/caffeine/build.gradle
index e4471b4825..cf62a0503b 100644
--- a/caffeine/build.gradle
+++ b/caffeine/build.gradle
@@ -31,15 +31,9 @@ eclipse.classpath {
       entries.findAll {
         it instanceof SourceFolder && it.output == 'bin/codeGen'
       }*.output = 'bin/main'
-      entries.findAll { it instanceof AbstractClasspathEntry }.each {
-        it.entryAttributes['module'] = 'true'
-      }
-      def modules = [ 'java.compiler', 'java.logging', 'jdk.unsupported',
-        'com.google.common', 'com.google.googlejavaformat', 'guava.testlib',
-        'it.unimi.dsi.fastutil', 'org.apache.commons.lang3', 'org.cache2k.api',
-        'org.hamcrest', 'org.jctools.core', 'org.mockito', 'org.testng' ]
+      // Exclude module-info when compiling through Eclipse
       def main = entries.find { it instanceof SourceFolder && it.path == 'src/main/java' }
-      main.entryAttributes['add-reads'] = buildAddReads('com.github.benmanes.caffeine', modules)
+      main.excludes.add('module-info.java')
     }
   }
 }
diff --git a/gradle/eclipse.gradle b/gradle/eclipse.gradle
index 7393d89d0a..89beeed952 100644
--- a/gradle/eclipse.gradle
+++ b/gradle/eclipse.gradle
@@ -47,17 +47,4 @@ def ignoreDerivedResources(projectDescription, directories = [
       }
     }
   }
-}
-
-ext.buildAddReads = { subjectModule, addModules ->
-  def addReads = new StringBuilder()
-  addModules.each {
-    if (addReads.length() != 0) {
-      addReads.append(':')
-    }
-    addReads.append(subjectModule)
-    addReads.append('=')
-    addReads.append(it)
-  }
-  return addReads.toString()
-}
+}
\ No newline at end of file