Moved to package prefixes and added src split for resouces

build.gradle

@@ -55,17 +55,7 @@ project(":demo4d-numberxd") {
 	}
 }
 
-project(":desktop") {
+project(":demo4d-gdxapp") {
-	apply plugin: "java-library"
-	dependencies {
-		implementation project(":core")
-		api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
-		api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-		api "games.spooky.gdx:gdx-nativefilechooser-desktop:$nativefilechooserVersion"
-	}
-}
-
-project(":core") {
 	apply plugin: "java-library"
 	dependencies {
 		//api "org.x4o:x4o-driver:$x4oVersion"
@@ -79,3 +69,13 @@ project(":core") {
 		api "games.spooky.gdx:gdx-nativefilechooser:$nativefilechooserVersion"
 	}
 }
+
+project(":demo4d-gdxapp-desktop") {
+	apply plugin: "java-library"
+	dependencies {
+		implementation project(":demo4d-gdxapp")
+		api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
+		api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+		api "games.spooky.gdx:gdx-nativefilechooser-desktop:$nativefilechooserVersion"
+	}
+}

core/build.gradle

@@ -1,6 +0,0 @@
-sourceCompatibility = appJvmCode
-[compileJava, compileTestJava]*.options*.encoding = appEncoding
-
-sourceSets.main.java.srcDirs = [ "src/", "resources/" ]
-
-eclipse.project.name = appName + "-core"

demo4d-gdxapp-desktop/build.gradle

@@ -1,11 +1,11 @@
 sourceCompatibility = appJvmCode
 [compileJava, compileTestJava]*.options*.encoding = appEncoding
 
-sourceSets.main.java.srcDirs = [ "src/" ]
+sourceSets.main.java.srcDirs = [ "src/main/"]
-sourceSets.main.resources.srcDirs = ["../core/assets"]
+sourceSets.main.resources.srcDirs = ["../demo4d-gdxapp/assets"]
 
 project.ext.mainClassName = "love.distributedrebirth.demo4d.desktop.DesktopLauncher"
-project.ext.assetsDir = new File("../core/assets")
+project.ext.assetsDir = new File("../demo4d-gdxapp/assets")
 
 task run(dependsOn: classes, type: JavaExec) {
     main = project.mainClassName
@@ -35,7 +35,4 @@ task dist(type: Jar) {
     with jar
 }
 
-
 dist.dependsOn classes
-
-eclipse.project.name = appName + "-desktop"

demo4d-gdxapp/build.gradle

@@ -0,0 +1,7 @@
+sourceCompatibility = appJvmCode
+[compileJava, compileTestJava]*.options*.encoding = appEncoding
+
+sourceSets.main.java.srcDirs = [ "src/main/"]
+sourceSets.main.resources.srcDirs = [ "src/resources/" ]
+sourceSets.test.java.srcDirs = [ "src/test/"]
+sourceSets.test.resources.srcDirs = [ "src/test-resources/" ]

settings.gradle

@@ -1 +1 @@
-include 'desktop', 'core', 'demo4d-bassboonyd', 'demo4d-numberxd'
+include 'demo4d-gdxapp-desktop', 'demo4d-gdxapp', 'demo4d-bassboonyd', 'demo4d-numberxd'