Merge pull request #777 from kusumotolab/revert-shadowjar-usage

fatjar生成方法を元に戻した

Author: tt-kuma

.circleci/config.yml

@@ -72,7 +72,7 @@ jobs:
             - ~/.gradle
           key: v1-dependencies-{{ checksum "build.gradle" }}
       # ===== Assemble jar file
-      - run: ./gradlew shadowJar
+      - run: ./gradlew assemble
       # ===== Collect and persist the built artifacts
       - run:
           name: Collect artifacts to be released

.circleci/publish-new-release.sh

@@ -18,9 +18,9 @@ go get -u github.com/tcnksm/ghr
 
 echo "Starting to publish a new release as the version: ${WANTED_VERSION} ..."
 
-# trim suffix "-all" of fat jar
-jar=$(ls ./workspace/artifacts/*.jar)
-mv $jar ${jar/-all/}
+# # trim suffix "-all" of fat jar
+# jar=$(ls ./workspace/artifacts/*.jar)
+# mv $jar ${jar/-all/}
 
 # generate change log
 CHANGELOG="## Change Log

build.gradle

@@ -21,9 +21,6 @@ plugins {
 
     // Gradle lint
     id "nebula.lint" version "16.9.0"
-
-    // To generate fat jar
-    id "com.github.johnrengelman.shadow" version "6.0.0"
 }
 
 // Set compiler version
@@ -88,12 +85,20 @@ jar {
         attributes "Main-Class": "jp.kusumotolab.kgenprog.CUILauncher"
     }
 
+    // fatjar must include all dependencies
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    // exclude jar signatures for jar compression to avoid invalid signature
+    exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
+
     doFirst {
         // copy gradle.properties to resolve version info
         copy {
             from 'gradle.properties'
             into buildDir.name + '/resources/main/'
         }
+
         // annotate whether this task was executed on CI or not
         def isCi = System.getenv('CI') ? 'true' : 'false'
         File prop = new File(buildDir.name + '/resources/main/gradle.properties')
@@ -123,8 +128,3 @@ jacocoTestReport {
         }))
     }
 }
-
-// Minimize generating fat jar
-shadowJar {
-    minimize()
-}

src/main/java/jp/kusumotolab/kgenprog/project/factory/JUnitLibraryResolver.java

@@ -1,12 +1,14 @@
 package jp.kusumotolab.kgenprog.project.factory;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.MissingResourceException;
 import jp.kusumotolab.kgenprog.CUILauncher;
 import jp.kusumotolab.kgenprog.project.ClassPath;
 
@@ -25,26 +27,26 @@ public enum JUnitVersion {
       new EnumMap<>(JUnitVersion.class);
 
   static {
+    setupResourceJar(JUNIT3_DIR, JUNIT3_JUNIT, JUnitVersion.JUNIT3);
+    setupResourceJar(JUNIT4_DIR, JUNIT4_JUNIT, JUnitVersion.JUNIT4);
+  }
+
+  private static void setupResourceJar(final String dir, final String jar,
+      final JUnitVersion version) {
+    final String jarPath = dir + jar;
+    final ClassLoader classLoader = CUILauncher.class.getClassLoader();
+    final InputStream is = classLoader.getResourceAsStream(jarPath);
+    if (null == is) {
+      throw new MissingResourceException("Missing runtime junit library: " + jarPath, jarPath, "");
+    }
 
+    final Path tempPath = getTempDirectory().resolve(jar);
     try {
-      final ClassLoader classLoader = CUILauncher.class.getClassLoader();
-      final InputStream junit3JInputStream =
-          classLoader.getResourceAsStream(JUNIT3_DIR + JUNIT3_JUNIT);
-      final InputStream junit4JInputStream =
-          classLoader.getResourceAsStream(JUNIT4_DIR + JUNIT4_JUNIT);
-
-      final Path systemTempPath = getTempDirectory();
-      final Path junit3JPath = systemTempPath.resolve(JUNIT3_JUNIT);
-      final Path junit4JPath = systemTempPath.resolve(JUNIT4_JUNIT);
-
-      Files.copy(junit3JInputStream, junit3JPath, StandardCopyOption.REPLACE_EXISTING);
-      Files.copy(junit4JInputStream, junit4JPath, StandardCopyOption.REPLACE_EXISTING);
-
-      libraries.put(JUnitVersion.JUNIT3, Arrays.asList(new ClassPath(junit3JPath)));
-      libraries.put(JUnitVersion.JUNIT4, Arrays.asList(new ClassPath(junit4JPath)));
-    } catch (Exception e) {
-      e.printStackTrace();
+      Files.copy(is, tempPath, StandardCopyOption.REPLACE_EXISTING);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
     }
+    libraries.put(version, Collections.singletonList(new ClassPath(tempPath)));
   }
 
   // TODO 一時dirの責務をひとまずこのクラスに任せたが，巨大になるなら別クラスに切った方がよさそう．
@@ -55,8 +57,8 @@ public static Path getTempDirectory() {
       if (null == tempDir) {
         tempDir = Files.createTempDirectory("kgp-");
       }
-    } catch (Exception e) {
-      e.printStackTrace();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
     }
     return tempDir;
   }