From b3ac05fdd9ff955bc918e729f6a5df785dcfec4f Mon Sep 17 00:00:00 2001 From: fastily Date: Sat, 22 Apr 2017 00:35:36 -0700 Subject: [PATCH] fixed gradle build: made MTC jar creation a gradle task --- build.gradle | 20 ++++++++------------ src/main/java/mtc/MTCController.java | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 0dd8737..02646d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,7 @@ apply plugin: 'java' apply plugin: 'eclipse' -apply plugin: 'maven' description="ctools build script" -version="1.0.0" - -compileJava { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" -} repositories { jcenter() @@ -25,17 +18,20 @@ task wrapper(type: Wrapper) { gradleVersion = '3.5' } -jar { - archiveName = "MTC-1.0.0.jar" + +task mtc(type: Jar) { + baseName = "MTC" + version = "1.0.0" from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } - configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } } - + manifest { attributes 'Main-Class': 'mtc.App' } - exclude "**/bots/**", "**/reports/**", "**/tools/**" + exclude "**/bots/**", "**/reports/**", "**/tools/**", "META-INF/*.SF", "**/LICENSE*", "**/NOTICE*", "**/maven/**" + + with jar } \ No newline at end of file diff --git a/src/main/java/mtc/MTCController.java b/src/main/java/mtc/MTCController.java index 1b0ddf1..a95a727 100644 --- a/src/main/java/mtc/MTCController.java +++ b/src/main/java/mtc/MTCController.java @@ -186,7 +186,7 @@ else if (currTask.isRunning()) * * @param msg The new message to add. */ - private void printToConsole(String msg) + private synchronized void printToConsole(String msg) { console.appendText(String.format("(%s): %s%n", LocalDateTime.now().format(df), msg)); }