Update lib - use base module

Ealrann · Jul 23, 2019 · 0bbeea7 · 0bbeea7
1 parent 66ec9ad
commit 0bbeea7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/Lily-Vulkan b/Lily-Vulkan
diff --git a/org.sheepy.vsand/build.gradle b/org.sheepy.vsand/build.gradle
@@ -73,15 +73,10 @@ test {
 }
 
 dependencies {
-	implementation 'org.sheepy.lily.core:org.sheepy.lily.core.impl'
 
-	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.api'
-	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.process.compute'
-	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.process.graphic'
+	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.base'
 
 	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.extra.api'
-	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.extra.graphic'
-
 	implementation 'org.sheepy.lily.vulkan:org.sheepy.lily.vulkan.extra.nuklear'
 
 	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'

diff --git a/org.sheepy.vsand/src/main/java/module-info.java b/org.sheepy.vsand/src/main/java/module-info.java
@@ -38,19 +38,9 @@
 {
 	requires openj9.sharedclasses;
 
-	requires org.sheepy.lily.vulkan.extra.nuklear;
-
-	requires org.sheepy.lily.core.impl;
-
-	requires org.sheepy.lily.vulkan.api;
-	requires org.sheepy.lily.vulkan.common;
-	requires org.sheepy.lily.vulkan.process;
-	requires org.sheepy.lily.vulkan.process.compute;
-	requires org.sheepy.lily.vulkan.process.graphic;
-	requires org.sheepy.lily.vulkan.resource;
-
+	requires org.sheepy.lily.vulkan.base;
 	requires org.sheepy.lily.vulkan.extra.api;
-	requires org.sheepy.lily.vulkan.extra.graphic;
+	requires org.sheepy.lily.vulkan.extra.nuklear;
 
 	opens org.sheepy.vsand;
 	opens org.sheepy.vsand.constants;

diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/ui/MaterialSelectorPanelAdapter.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/ui/MaterialSelectorPanelAdapter.java
@@ -17,7 +17,7 @@
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Statefull;
 import org.sheepy.lily.core.model.presentation.IUIElement;
-import org.sheepy.lily.vulkan.common.util.UIUtil;
+import org.sheepy.lily.vulkan.api.util.UIUtil;
 import org.sheepy.lily.vulkan.nuklear.ui.IUIElementAdapter;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.MaterialSelectorPanel;
+1 −1		Lily-core
+15 −0		org.sheepy.lily.vulkan.api/src/main/java/org/sheepy/lily/vulkan/api/resource/ISemaphoreAdapter.java
+1 −1		org.sheepy.lily.vulkan.api/src/main/java/org/sheepy/lily/vulkan/api/util/SizeOf.java
+1 −1		org.sheepy.lily.vulkan.api/src/main/java/org/sheepy/lily/vulkan/api/util/UIUtil.java
+15 −0		org.sheepy.lily.vulkan.base/build.gradle
+12 −0		org.sheepy.lily.vulkan.base/src/main/java/module-info.java
+1 −2		org.sheepy.lily.vulkan.common/build.gradle
+0 −2		org.sheepy.lily.vulkan.common/src/main/java/module-info.java
+1 −2		org.sheepy.lily.vulkan.demo.gameoflife/build.gradle
+1 −4		org.sheepy.lily.vulkan.demo.gameoflife/src/main/java/module-info.java
+1 −1		...sheepy.lily.vulkan.demo.gameoflife/src/main/java/org/sheepy/lily/vulkan/demo/gameoflife/MainGameOfLife.java
+2 −1		org.sheepy.lily.vulkan.demo.texture/build.gradle
+1 −1		org.sheepy.lily.vulkan.demo.texture/src/main/java/module-info.java
+1 −1		...heepy.lily.vulkan.demo.texture/src/main/java/org/sheepy/lily/vulkan/demo/adapter/CameraConstantAdapter.java
+12 −0		org.sheepy.lily.vulkan.extra.base/build.gradle
+9 −0		org.sheepy.lily.vulkan.extra.base/src/main/java/module-info.java
+0 −2		org.sheepy.lily.vulkan.extra.graphic/build.gradle
+0 −2		org.sheepy.lily.vulkan.extra.graphic/src/main/java/module-info.java
+15 −8		...an.extra.graphic/src/main/java/org/sheepy/lily/vulkan/extra/rendering/GenericRendererMaintainerAdapter.java
+0 −1		org.sheepy.lily.vulkan.extra.nuklear/build.gradle
+0 −2		org.sheepy.lily.vulkan.extra.nuklear/src/main/java/module-info.java
+1 −1		org.sheepy.lily.vulkan.extra.nuklear/src/main/java/org/sheepy/lily/vulkan/nuklear/ui/PanelAdapter.java
+4 −1		org.sheepy.lily.vulkan.process.compute/build.gradle
+4 −1		org.sheepy.lily.vulkan.process.compute/src/main/java/module-info.java
+4 −1		org.sheepy.lily.vulkan.process.graphic/build.gradle
+3 −2		org.sheepy.lily.vulkan.process.graphic/src/main/java/module-info.java
+3 −1		org.sheepy.lily.vulkan.process/build.gradle
+3 −2		org.sheepy.lily.vulkan.process/src/main/java/module-info.java
+3 −3		org.sheepy.lily.vulkan.process/src/main/java/org/sheepy/lily/vulkan/process/execution/ExecutionRecorders.java
+3 −8		org.sheepy.lily.vulkan.resource/src/main/java/org/sheepy/lily/vulkan/resource/semaphore/SemaphoreAdapter.java
+3 −1		settings.gradle