Merge 85a90e6 into 5509159

build.gradle

@@ -1,21 +1,22 @@
 // Gradle Configuration File
 // For more details take a look at the Java Quickstart chapter in the Gradle
-// user guide available at http://gradle.org/docs/4.8.1/userguide/tutorial_java_projects.html
+// user guide available at http://gradle.org/docs/5.2.1/userguide/tutorial_java_projects.html
 
+import org.apache.commons.lang.SystemUtils
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id 'java'
     id 'jacoco'
     id 'checkstyle'
     id 'com.github.kt3k.coveralls' version '2.4.0'
-    id 'com.github.johnrengelman.shadow' version '2.0.3'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
     id 'org.asciidoctor.convert' version '1.5.6'
     id 'application'
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.MainApp'
+mainClassName = 'seedu.address.Main'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -27,6 +28,7 @@ repositories {
 
 checkstyle {
     toolVersion = '8.1'
+    configDir = file("$rootProject.projectDir/config/checkstyle")
 }
 
 jacocoTestReport {
@@ -41,10 +43,39 @@ test {
     useJUnitPlatform()
 }
 
+def platform
+def firstOtherPlatform
+def secondOtherPlatform
+if (SystemUtils.IS_OS_WINDOWS) {
+    platform = 'win'
+    firstOtherPlatform = 'mac'
+    secondOtherPlatform = 'linux'
+} else if (SystemUtils.IS_OS_LINUX) {
+    platform = 'linux'
+    firstOtherPlatform = 'mac'
+    secondOtherPlatform = 'win'
+} else if (SystemUtils.IS_OS_MAC) {
+    platform = 'mac'
+    firstOtherPlatform = 'win'
+    secondOtherPlatform = 'linux'
+}
+
 dependencies {
     String testFxVersion = '4.0.12-alpha'
     String jUnitVersion = '5.1.0'
 
+    compile "org.openjfx:javafx-base:11:${platform}"
+    compile "org.openjfx:javafx-controls:11:${platform}"
+    compile "org.openjfx:javafx-fxml:11:${platform}"
+    compile "org.openjfx:javafx-graphics:11:${platform}"
+    compile "org.openjfx:javafx-media:11:${platform}"
+    compile "org.openjfx:javafx-web:11:${platform}"
+
+    compile "org.openjfx:javafx-graphics:11:${firstOtherPlatform}"
+    compile "org.openjfx:javafx-graphics:11:${secondOtherPlatform}"
+    compile "org.openjfx:javafx-web:11:${firstOtherPlatform}"
+    compile "org.openjfx:javafx-web:11:${secondOtherPlatform}"
+
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
 
@@ -65,18 +96,14 @@ shadowJar {
     destinationDir = file("${buildDir}/jar/")
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.8.1'
-}
-
 task coverage(type: JacocoReport) {
-    sourceDirectories = files(sourceSets.main.allSource.srcDirs)
-    classDirectories =  files(sourceSets.main.output)
-    executionData = files(jacocoTestReport.executionData)
+    getSourceDirectories().from(files(sourceSets.main.allSource.srcDirs))
+    getClassDirectories().from(files(sourceSets.main.output))
+    getExecutionData().from(files(jacocoTestReport.executionData))
     afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
+        getClassDirectories().from(files(classDirectories.files.collect {
             fileTree(dir: it, exclude: ['**/*.jar'])
-        })
+        }))
     }
     reports {
         html.enabled = true

config/checkstyle/checkstyle.xml

@@ -26,16 +26,13 @@
   </module>
 
   <module name="SuppressionFilter">
-    <property name="file" value="config/checkstyle/suppressions.xml"/>
+    <property name="file" value="${config_loc}/suppressions.xml"/>
   </module>
 
 
   <!-- All Java AST specific tests live under TreeWalker module. -->
   <module name="TreeWalker">
 
-    <!-- Required for SuppressionCommentFilter to work -->
-    <module name="FileContentsHolder"/>
-
     <!-- Required to allow exceptions in code style -->
     <module name="SuppressionCommentFilter">
       <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/seedu/address/Main.java

@@ -0,0 +1,10 @@
+package seedu.address;
+
+/**
+ * The main entry point to the application.
+ */
+public class Main {
+    public static void main(String[] args) {
+        MainApp.initiate(args);
+    }
+}

src/main/java/seedu/address/MainApp.java

@@ -32,7 +32,7 @@
 import seedu.address.ui.UiManager;
 
 /**
- * The main entry point to the application.
+ * The class needed to initiate the application.
  */
 public class MainApp extends Application {
 
@@ -181,7 +181,7 @@ public void stop() {
         }
     }
 
-    public static void main(String[] args) {
+    public static void initiate(String[] args) {
         launch(args);
     }
 }