support 'requires static' and 'requires transitive'

Glavo · Apr 21, 2022 · be47a3f · be47a3f
1 parent 27452f1
commit be47a3f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -37,14 +37,14 @@ Maven:
 <dependency>
     <groupId>org.glavo</groupId>
     <artifactId>module-info-compiler</artifactId>
-    <version>1.3</version>
+    <version>1.5</version>
 </dependency>
 ```
 
 Gradle:
 
 ```kotlin
-implementation("org.glavo:module-info-compiler:1.3")
+implementation("org.glavo:module-info-compiler:1.5")
 ```
 
 ### Gradle Task (`CompileModuleInfo`)
@@ -58,7 +58,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.glavo:module-info-compiler:1.3")
+        classpath("org.glavo:module-info-compiler:1.5")
     }
 }
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ allprojects {
     }
 
     group = "org.glavo"
-    version = "1.4"// + "-SNAPSHOT"
+    version = "1.5"// + "-SNAPSHOT"
 
     repositories {
         mavenCentral()

diff --git a/src/main/java/org/glavo/mic/ModuleInfoCompiler.java b/src/main/java/org/glavo/mic/ModuleInfoCompiler.java
@@ -3,6 +3,7 @@
 import com.github.javaparser.ParseProblemException;
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.modules.*;
@@ -102,7 +103,16 @@ public void compile(Reader source, OutputStream target) throws IOException {
                 } else if (directive.isModuleRequiresDirective()) {
                     ModuleRequiresDirective requires = directive.asModuleRequiresDirective();
                     if (!requires.getNameAsString().equals("java.base")) {
-                        moduleVisitor.visitRequire(requires.getNameAsString(), 0, null);
+                        int access = 0;
+                        for (Modifier modifier : requires.getModifiers()) {
+                            if (modifier.getKeyword() == Modifier.Keyword.STATIC) {
+                                access |= Opcodes.ACC_STATIC_PHASE;
+                            } else if (modifier.getKeyword() == Modifier.Keyword.TRANSITIVE) {
+                                access |= Opcodes.ACC_TRANSITIVE;
+                            }
+                        }
+
+                        moduleVisitor.visitRequire(requires.getNameAsString(), access, null);
                     }
                 } else if (directive.isModuleUsesDirective()) {
                     ModuleUsesDirective uses = directive.asModuleUsesDirective();