Skip to content

Commit

Permalink
Merge pull request #738 from csmith/master
Browse files Browse the repository at this point in the history
Copy fat jars into dist/ like normal jars.
  • Loading branch information
ShaneMcC committed Dec 31, 2016
2 parents 646b305 + 152fbfc commit fc46201
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions gradle/fatjar.gradle
Expand Up @@ -73,4 +73,12 @@ task('fatjar', type: Jar) {
manifest {
attributes 'Main-Class': 'com.dmdirc.Main'
}

doLast {
copy {
from jar.archivePath
into "dist/"
rename ".*", "DMDirc-fat.jar"
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/dmdirc/FrameContainer.java
Expand Up @@ -102,7 +102,7 @@ public FrameContainer(
this.eventBus = eventBus;
this.unreadStatusManager = new UnreadStatusManagerImpl(this);
this.eventBus.subscribe(unreadStatusManager);
configManager.getBinder().bind(unreadStatusManager, UnreadStatusManager.class);
configManager.getBinder().bind(unreadStatusManager, UnreadStatusManagerImpl.class);

setIcon(icon);
}
Expand Down

0 comments on commit fc46201

Please sign in to comment.