Changeset 3f4daede

Timestamp:

Nov 3, 2017 6:23:49 PM (4 years ago)

Author:

zab2 <zab2@…>

Branches:

master

Children:

3acb7a5

Parents:

49d970c

Message:

switch to a single sourceSet. This fixes the last remaining problem with one-click import in eclipse

File:

• apps/i2psnark/build.gradle (modified) (4 diffs)

apps/i2psnark/build.gradle

@@ -5 +5 @@
         java {
             srcDir 'java/src'
-            include 'org/klomp/snark/web/**'
-        }
-    }
-    jar {
-        java {
-            srcDir 'java/src'
-            exclude 'org/klomp/snark/standalone'
-            exclude 'org/klomp/snark/web'
         }
     }
@@ -18 +10 @@
 
 dependencies {
-    jarCompile project(':core')
-    jarCompile project(':apps:ministreaming')
-    jarCompile project(':apps:systray')
-    providedCompile sourceSets.jar.output
+    compile project(':core')
+    compile project(':apps:systray')
     providedCompile project(':apps:ministreaming')
     providedCompile project(':apps:jetty')
@@ -27 +17 @@
 
 task i2psnarkJar(type: Jar) {
-    from sourceSets.jar.output
+    from sourceSets.main.output
+    exclude 'org/klomp/snark/standalone/**'
+    exclude 'org/klomp/snark/web/**'
     manifest {
         attributes 'Main-Class': 'org.klomp.snark.Snark'
@@ -33 +25 @@
     }
 }
+
+// TODO: standalone jar.  This is rather involved!
 
 artifacts {