diff --git a/caffeine/build.gradle b/caffeine/build.gradle index 298c6202..b27e3fc4 100644 --- a/caffeine/build.gradle +++ b/caffeine/build.gradle @@ -1,3 +1,4 @@ +import org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry import org.gradle.plugins.ide.eclipse.model.SourceFolder apply from: "${rootDir}/gradle/jmh.gradle" @@ -27,13 +28,16 @@ eclipse.classpath { containers 'org.eclipse.buildship.core.gradleclasspathcontainer' file { whenMerged { - entries.findAll { it instanceof SourceFolder && it.output == 'bin/codeGen' }*.output = 'bin/main' - entries.findAll { it instanceof org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry }.each { + 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' ] + 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' ] def main = entries.find { it instanceof SourceFolder && it.path == 'src/main/java' } main.entryAttributes['add-reads'] = buildAddReads('com.github.benmanes.caffeine', modules) } diff --git a/caffeine/src/main/java/module-info.java b/caffeine/src/main/java/module-info.java index 99b52f3a..9a81dc1a 100644 --- a/caffeine/src/main/java/module-info.java +++ b/caffeine/src/main/java/module-info.java @@ -1,8 +1,7 @@ - module com.github.benmanes.caffeine { - exports com.github.benmanes.caffeine.cache; - exports com.github.benmanes.caffeine.cache.stats; + exports com.github.benmanes.caffeine.cache; + exports com.github.benmanes.caffeine.cache.stats; - requires static transitive org.checkerframework.checker.qual; - requires static transitive com.google.errorprone.annotations; -} \ No newline at end of file + requires static transitive org.checkerframework.checker.qual; + requires static transitive com.google.errorprone.annotations; +} diff --git a/gradle/codeQuality.gradle b/gradle/codeQuality.gradle index 19f97dfd..b756d889 100644 --- 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/guava/build.gradle b/guava/build.gradle index b933390b..69be0fc8 100644 --- 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 index 710ac5d5..15c9c062 100644 --- 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 index fc8c357a..ee7313ce 100644 --- a/simulator/build.gradle +++ b/simulator/build.gradle @@ -35,6 +35,10 @@ dependencies { testImplementation testLibraries.testng } +compileJava { + modularity.inferModulePath = false +} + test { useTestNG() }