浏览代码

Revert "[libgdx] Prettify Gradle build."

This reverts commit c2c7697ea5b3703cb96cca0e8b1516f1a5ce930d.
Mario Zechner 3 年之前
父节点
当前提交
f7d0a1120c
共有 3 个文件被更改,包括 25 次插入11 次删除
  1. 1 4
      .gitignore
  2. 22 7
      spine-libgdx/build.gradle
  3. 2 0
      spine-libgdx/settings.gradle

+ 1 - 4
.gitignore

@@ -151,7 +151,4 @@ spine-ts/spine-core/dist
 spine-ts/spine-canvas/dist
 spine-ts/spine-webgl/dist
 spine-ts/spine-player/dist
-spine-ts/spine-threejs/dist
-spine-libgdx/spine-libgdx/out
-spine-libgdx/spine-libgdx-tests/out
-spine-libgdx/spine-skeletonviewer/out
+spine-ts/spine-threejs/dist

+ 22 - 7
spine-libgdx/build.gradle

@@ -7,10 +7,6 @@ ext {
 }
 
 allprojects {
-    apply plugin: "java"
-
-    sourceSets.main.java.srcDirs = ["src"]
-
     repositories {
         mavenLocal()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
@@ -19,18 +15,37 @@ allprojects {
 }
 
 project("spine-libgdx") {
-    apply plugin: "java-library"
+    apply plugin: "java"
+    sourceSets.main.java.srcDirs = ["src"]
+
+    dependencies {
+        implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
+    }
+}
+
+project("spine-libgdx-tests") {
+    apply plugin: "java"
+    sourceSets.main.java.srcDirs = ["src"]
+    sourceSets.main.resources.srcDirs = ["assets"]
 
     dependencies {
+        implementation  project(":spine-libgdx")
         implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
+        implementation "com.badlogicgames.gdx:gdx-platform:$libgdxVersion:natives-desktop"
+        implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$libgdxVersion"
+        implementation "com.badlogicgames.gdx:gdx-lwjgl3-glfw-awt-macos:$libgdxVersion"
+        implementation "com.badlogicgames.gdx:gdx-box2d:$libgdxVersion"
+        implementation "com.badlogicgames.gdx:gdx-box2d-platform:$libgdxVersion:natives-desktop"
     }
 }
 
-configure(subprojects - project("spine-libgdx")) {
+project("spine-skeletonviewer") {
+    apply plugin: "java"
+    sourceSets.main.java.srcDirs = ["src"]
     sourceSets.main.resources.srcDirs = ["assets"]
 
     dependencies {
-        implementation project(":spine-libgdx")
+        implementation  project(":spine-libgdx")
         implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
         implementation "com.badlogicgames.gdx:gdx-platform:$libgdxVersion:natives-desktop"
         implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$libgdxVersion"

+ 2 - 0
spine-libgdx/settings.gradle

@@ -1,4 +1,6 @@
 // includeBuild "../../libgdx"
+// rootProject.name = "spine-libgdx-parent"
+
 include ":spine-libgdx"
 include ":spine-libgdx-tests"
 include ":spine-skeletonviewer"