Merge pull request #272 from joankaradimov/fix-manifest-issue

Allow manifest attributes to coexist with Main-Class

Author: R. Tyler Croy

jruby-gradle-jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJar.groovy

@@ -213,9 +213,7 @@ class JRubyJar extends Jar {
                 exclude 'META-INF/maven/**/pom.xml'
             }
 
-            manifest = project.manifest {
-                attributes 'Main-Class': mainClass
-            }
+            manifest.attributes 'Main-Class': mainClass
         }
 
         if (scriptName != Type.RUNNABLE && scriptName != Type.LIBRARY) {

jruby-gradle-jar-plugin/src/test/groovy/com/github/jrubygradle/jar/JRubyJarPluginSpec.groovy

@@ -126,6 +126,18 @@ class JRubyJarPluginSpec extends Specification {
         jarTask.manifest.attributes.'Main-Class' == 'org.scooby.doo.snackMain'
     }
 
+    def "Adding a main class and additional manifest attributes"() {
+        when: "Setting a main class"
+        project.configure(jarTask) {
+            mainClass 'org.scooby.doo.snackMain'
+            manifest.attributes('Class-Path': 'gangway.jar zoinks.jar')
+        }
+        jarTask.applyConfig()
+
+        then: "Then the Main-Class attribute does not erase other attributes"
+        jarTask.manifest.attributes.'Class-Path' == 'gangway.jar zoinks.jar'
+    }
+
     def "Setting up a java project"() {
         given: "All jar, java plugins have been applied"
         project = setupProject()