1 files changed, 36 insertions, 36 deletions

diff --git a/build.gradle b/build.gradle
index 806ceb6..9caeabd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,51 +1,51 @@
 apply plugin: 'java'
 
-jar {
-    baseName "libprotobuf"
-        appendix "java"
-        version "2.3"
-        classifier "micronano"
+configurations {
+    micro
+    nano
 }
 
-project(":external:protobuf:nano") {
-    apply plugin: 'java'
-    sourceSets {
-        main {
-            java {
-                // path is relative to external/protobuf/nano which doesn't exist.
-                srcDirs = ['../java/src/main/java/com/google/protobuf/nano']
-            }
+sourceSets {
+    micro {
+        java {
+            srcDirs = ['java/src/main/java/com/google/protobuf/micro']
         }
     }
 
-    jar {
-        baseName "libprotobuf"
-        appendix "java"
-        version "2.3"
-        classifier "nano"
+    nano {
+        java {
+            srcDirs = ['java/src/main/java/com/google/protobuf/nano']
+        }
     }
 }
 
-project(":external:protobuf:micro") {
-    apply plugin: 'java'
-    sourceSets {
-        main {
-            java {
-                srcDirs = ['../java/src/main/java/com/google/protobuf/micro']
-            }
-        }
-    }
+jar {
+    from sourceSets.nano.output, sourceSets.micro.output
+    baseName "libprotobuf"
+    appendix "java"
+    version "2.3"
+    classifier "micronano"
+}
 
-    jar {
-        baseName "libprotobuf"
-        appendix "java"
-        version "2.3"
-        classifier "micro"
-    }
+task nanoJar(type: Jar) {
+    from sourceSets.nano.output
+    dependsOn nanoClasses
+    baseName "libprotobuf"
+    appendix "java"
+    version "2.3"
+    classifier "nano"
 }
 
+task microJar(type: Jar) {
+    from sourceSets.micro.output
+    dependsOn microClasses
+    baseName "libprotobuf"
+    appendix "java"
+    version "2.3"
+    classifier "micro"
+}
 
-dependencies {
-    compile project(':external:protobuf:micro')
-    compile project(':external:protobuf:nano')
+artifacts {
+    micro microJar
+    nano nanoJar
 }
\ No newline at end of file