瀏覽代碼

Merge pull request #738 from csmith/master

Copy fat jars into dist/ like normal jars.
pull/746/head
Shane Mc Cormack 7 年之前
父節點
當前提交
fc4620157c
共有 2 個檔案被更改,包括 9 行新增1 行删除
  1. 8
    0
      gradle/fatjar.gradle
  2. 1
    1
      src/main/java/com/dmdirc/FrameContainer.java

+ 8
- 0
gradle/fatjar.gradle 查看文件

73
     manifest {
73
     manifest {
74
         attributes 'Main-Class': 'com.dmdirc.Main'
74
         attributes 'Main-Class': 'com.dmdirc.Main'
75
     }
75
     }
76
+
77
+    doLast {
78
+        copy {
79
+            from jar.archivePath
80
+            into "dist/"
81
+            rename ".*", "DMDirc-fat.jar"
82
+        }
83
+    }
76
 }
84
 }

+ 1
- 1
src/main/java/com/dmdirc/FrameContainer.java 查看文件

102
         this.eventBus = eventBus;
102
         this.eventBus = eventBus;
103
         this.unreadStatusManager = new UnreadStatusManagerImpl(this);
103
         this.unreadStatusManager = new UnreadStatusManagerImpl(this);
104
         this.eventBus.subscribe(unreadStatusManager);
104
         this.eventBus.subscribe(unreadStatusManager);
105
-        configManager.getBinder().bind(unreadStatusManager, UnreadStatusManager.class);
105
+        configManager.getBinder().bind(unreadStatusManager, UnreadStatusManagerImpl.class);
106
 
106
 
107
         setIcon(icon);
107
         setIcon(icon);
108
     }
108
     }

Loading…
取消
儲存