Merge branch 'prism2' into prism

avaje · Feb 7, 2023 · 2e9008e · 2e9008e
2 parents 6e65622 + 91c5da2
commit 2e9008e
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 5 deletions.
diff --git a/inject-prism/pom.xml b/inject-prism/pom.xml
@@ -3,14 +3,70 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.12-RC5</version>
+    <version>8.12-RC4</version>
   </parent>
   <artifactId>avaje-inject-prism</artifactId>
+  <build>
+    <plugins>
+    <!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Automatic-Module-Name>io.avaje.inject.prism</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <annotationProcessorPath>
+              <groupId>com.jolira</groupId>
+              <artifactId>hickory</artifactId>
+              <version>1.0.0</version>
+            </annotationProcessorPath>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.RC2</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>
+                  src/main/java/module-info.moditect
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>${project.version}</version>
+      <version>8.12-RC4</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -22,4 +78,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/inject-prism/src/main/java/module-info.java b/inject-prism/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+module io.avaje.inject.prism {
+
+  exports io.avaje.inject.prism to io.avaje.inject.generator;
+
+  requires static io.avaje.inject;
+
+  requires static hickory;
+
+  requires java.compiler;
+
+}
diff --git a/inject-prism/src/main/java/module-info.moditect b/inject-prism/src/main/java/module-info.moditect
@@ -0,0 +1,7 @@
+module io.avaje.inject.prism {
+
+  exports io.avaje.inject.prism to io.avaje.inject.generator;
+
+  requires java.compiler;
+
+}
diff --git a/inject-prism/src/main/resources/META-INF/MANIFEST.MF b/inject-prism/src/main/resources/META-INF/MANIFEST.MF