Merge branch 'calc-request' into tenor

2018-11-23 12:57:08 -08:00
parent 87a44e4093 e0d894d296
commit c5ecb9bb9b
108 changed files with 2790 additions and 1208 deletions
@@ -51,6 +51,10 @@ compileJava {
 }

 sourceSets {
+    comms {}
+    main {
+        compileClasspath += comms.compileClasspath + comms.output
+    }
    launch {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
    }
@@ -103,7 +107,7 @@ mixin {
 }

 jar {
-    from sourceSets.launch.output, sourceSets.api.output
+    from sourceSets.comms.output, sourceSets.launch.output, sourceSets.api.output
    preserveFileTimestamps = false
    reproducibleFileOrder = true
 }