Prevent duplicated resources in the .jar files.

gurkenlabs · Jan 12, 2020 · 7340f5b · 7340f5b
1 parent 60c0466
commit 7340f5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 32 deletions.
diff --git a/build-maven.gradle b/build-maven.gradle
@@ -4,15 +4,10 @@ apply plugin: 'signing'
 
 sourceSets {
   main.java.srcDir "src"
-  main.java.srcDir "resources"
+  main.resources.srcDir "resources"
 
-  test {
-    java {
-      srcDirs = ["tests"] 
-    }
-    resources {
-      srcDirs = ["tests"]
-    }  }
+  test.java.srcDir "tests"
+  test.resources.srcDir "tests"
 }
 
 repositories {
@@ -53,8 +48,6 @@ jar {
      exclude 'META-INF/services/**'
   }
 
-  from('resources') { include '**/*' }
-
   version = 'v0.4.18-alpha'
   exclude '**/*.dll'
   exclude '**/*.jnilib'

diff --git a/build.gradle b/build.gradle
@@ -16,23 +16,16 @@ natives {
 
 apply plugin: 'java'
 apply plugin: 'jacoco'
-apply plugin: 'maven'
 
 archivesBaseName = "litiengine"
 version = "v0.4.18-alpha"
 
 sourceSets {
   main.java.srcDir "src"
-  main.java.srcDir "resources"
+  main.resources.srcDir "resources"
 
-  test {
-    java {
-      srcDirs = ["tests"]
-    }
-    resources {
-      srcDirs = ["tests"]
-    }
-  }
+  test.java.srcDir "tests"
+  test.resources.srcDir "tests"
 }
 
 repositories {
@@ -72,8 +65,6 @@ jar {
   } {
      exclude 'META-INF/services/**'
   }
-
-  from('resources') { include '**/*' }
 
   exclude '**/*.dll'
   exclude '**/*.jnilib'

diff --git a/utiliti/build.gradle b/utiliti/build.gradle
@@ -15,15 +15,8 @@ sourceSets {
   main.resources.srcDir "resources"
   main.resources.srcDir "localization"
 
-  test {
-    java {
-      srcDirs = ["tests"]
-    }
-
-    resources {
-      srcDirs = ["tests"]
-    }
-  }
+  test.java.srcDir "tests"
+  test.resources.srcDir "tests"
 }
 
 dependencies {
@@ -51,7 +44,6 @@ jar {
      exclude 'META-INF/services/**'
   }
 
-  from('resources') { include '**/*' }
   exclude '**/*.dll'
   exclude '**/*.jnilib'
   exclude '**/*.dylib'