Add module descriptor while maintaining Eclipse IDE experience

A248 · ben-manes · commit 3d735bcfdf94 · 2021-04-29T11:11:46.000-07:00
* Fixes #535 * Uses Gradle Eclipse plugin to exclude module-info from compilation in Eclipse. Prevents hordes of issues.
diff --git a/caffeine/build.gradle b/caffeine/build.gradle
@@ -24,7 +24,12 @@ idea.module {
 }
 
 eclipse.classpath.file.whenMerged {
-  entries.findAll { it instanceof SourceFolder && it.output == 'bin/codeGen' }*.output = 'bin/main'
+  entries.findAll {
+    it instanceof SourceFolder && it.output == 'bin/codeGen'
+  }*.output = 'bin/main'
+  // Exclude module-info when compiling through Eclipse
+  def main = entries.find { it instanceof SourceFolder && it.path == 'src/main/java' }
+  main.excludes.add('module-info.java')
 }
 
 plugins.withType(EclipsePlugin) {
diff --git a/caffeine/src/main/java/module-info.java b/caffeine/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module com.github.benmanes.caffeine {
+  exports com.github.benmanes.caffeine.cache;
+  exports com.github.benmanes.caffeine.cache.stats;
+
+  requires static transitive com.google.errorprone.annotations;
+  requires static transitive org.checkerframework.checker.qual;
+}
diff --git a/gradle/codeQuality.gradle b/gradle/codeQuality.gradle
@@ -148,7 +148,6 @@ tasks.withType(JavaCompile).configureEach {
       annotatedPackages.add('com.github.benmanes.caffeine')
     }
   }
-  modularity.inferModulePath.set(false)
   checkerFramework.skipCheckerFramework = true
 }
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -41,7 +41,7 @@ ext {
     elasticSearch: '7.12.0',
     expiringMap: '0.5.9',
     fastfilter: '1.0',
-    fastutil: '8.5.4',
+    fastutil: '8.5.2',
     flipTables: '1.1.0',
     googleJavaFormat: '1.10.0',
     guava: '30.1.1-jre',
@@ -165,10 +165,14 @@ ext {
     jcacheTck: "javax.cache:cache-tests:${testVersions.jcacheTck}",
     jcacheTckTests: "javax.cache:cache-tests:${testVersions.jcacheTck}:tests",
     jctools: "org.jctools:jctools-core:${testVersions.jctools}",
-    junit: "junit:junit:${testVersions.junit}",
+    junit: dependencies.create("junit:junit:${testVersions.junit}") {
+      exclude group: 'org.hamcrest'
+    },
     mockito: "org.mockito:mockito-core:${testVersions.mockito}",
     osgiCompile: [
-      "org.ops4j.pax.exam:pax-exam-junit4:${testVersions.paxExam}",
+      dependencies.create("org.ops4j.pax.exam:pax-exam-junit4:${testVersions.paxExam}") {
+        exclude group: 'org.hamcrest'
+      },
     ],
     osgiRuntime: [
       "org.apache.felix:org.apache.felix.framework:${testVersions.felix}",
diff --git a/guava/build.gradle b/guava/build.gradle
@@ -14,6 +14,10 @@ dependencies {
   testImplementation testLibraries.guavaTestLib
 }
 
+compileJava {
+  modularity.inferModulePath = false
+}
+
 jar.manifest {
   attributes 'Bundle-SymbolicName': 'com.github.ben-manes.caffeine.guava'
   attributes 'Import-Package': [
diff --git a/jcache/build.gradle b/jcache/build.gradle
@@ -30,6 +30,10 @@ dependencies {
   doc "${libraries.jcache}:javadoc"
 }
 
+compileJava {
+  modularity.inferModulePath = false
+}
+
 jar.manifest {
   attributes 'Bundle-SymbolicName': 'com.github.ben-manes.caffeine.jcache'
   attributes 'Import-Package': [
diff --git a/simulator/build.gradle b/simulator/build.gradle
@@ -35,6 +35,10 @@ dependencies {
   testImplementation testLibraries.testng
 }
 
+compileJava {
+  modularity.inferModulePath = false
+}
+
 test {
   useTestNG()
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,12 @@ idea.module {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`eclipse.classpath.file.whenMerged {`
`27`		`- entries.findAll { it instanceof SourceFolder && it.output == 'bin/codeGen' }*.output = 'bin/main'`
	`27`	`+ entries.findAll {`
	`28`	`+ it instanceof SourceFolder && it.output == 'bin/codeGen'`
	`29`	`+ }*.output = 'bin/main'`
	`30`	`+ // Exclude module-info when compiling through Eclipse`
	`31`	`+ def main = entries.find { it instanceof SourceFolder && it.path == 'src/main/java' }`
	`32`	`+ main.excludes.add('module-info.java')`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`plugins.withType(EclipsePlugin) {`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ tasks.withType(JavaCompile).configureEach {`
`148`	`148`	`annotatedPackages.add('com.github.benmanes.caffeine')`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- modularity.inferModulePath.set(false)`
`152`	`151`	`checkerFramework.skipCheckerFramework = true`
`153`	`152`	`}`
`154`	`153`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ dependencies {`
`35`	`35`	`testImplementation testLibraries.testng`
`36`	`36`	`}`
`37`	`37`
	`38`	`+compileJava {`
	`39`	`+ modularity.inferModulePath = false`
	`40`	`+}`
	`41`	`+`
`38`	`42`	`test {`
`39`	`43`	`useTestNG()`
`40`	`44`	`}`