Cleanup build scripts

jbachorik · jbachorik · commit 0702d5e3eaa9 · 2020-01-13T11:14:41.000+01:00
diff --git a/btrace-dist/build.gradle b/btrace-dist/build.gradle
@@ -61,6 +61,8 @@ task agentJar(type: ShadowJar) {
     exclude 'org/openjdk/btrace/services/**'
     exclude 'org/openjdk/btrace/statsd/*'
 
+    exclude 'module-info.class'
+
     configurations = [project.configurations.compile]
     relocate 'org.jctools', 'org.openjdk.btrace.libs.org.jctools'
     relocate 'org.objectweb.asm', 'org.openjdk.btrace.libs.org.objectweb.asm'
@@ -91,14 +93,11 @@ task bootJar(type: ShadowJar) {
 
     exclude 'org/openjdk/btrace/agent/**'
     exclude 'org/openjdk/btrace/client/**'
+    exclude 'module-info.class'
 
     configurations = [project.configurations.compile]
     relocate 'org.jctools', 'org.openjdk.btrace.libs.org.jctools'
     relocate 'org.objectweb.asm', 'org.openjdk.btrace.libs.org.objectweb.asm'
-
-    manifest {
-        attributes('Multi-Release' : 'true')
-    }
 }
 
 task clientJar(type: ShadowJar) {
diff --git a/btrace-runtime/build.gradle b/btrace-runtime/build.gradle
@@ -60,5 +60,4 @@ jar {
     into('') {
         from sourceSets.java11.output
     }
-    manifest.attributes('Multi-Release': 'true')
 }

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,4 @@ jar {`
`60`	`60`	`into('') {`
`61`	`61`	`from sourceSets.java11.output`
`62`	`62`	`}`
`63`		`- manifest.attributes('Multi-Release': 'true')`
`64`	`63`	`}`