Merge pull request #39 from notahotdog/B-Reminders

B-Reminders
AY1920S1-CS2113T-F14-2 · Sep 19, 2019 · ad55d08 · ad55d08
2 parents ce0028b + d95cead
commit ad55d08
Show file tree

Hide file tree

Showing 14 changed files with 1,139 additions and 710 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,45 +1,45 @@
-plugins {
-    id 'java'
-    id 'application'
-    id 'checkstyle'
-    id 'org.openjfx.javafxplugin' version '0.0.7'
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
-}
-
-checkstyle {
-    toolVersion = '8.23'
-}
-
-shadowJar {
-    archiveBaseName = "duke"
-    archiveVersion = "0.1.3"
-    archiveClassifier = null
-    archiveAppendix = null
-}
-
-group 'seedu.duke'
-version '0.1.0'
-
-repositories {
-    mavenCentral()
-}
-
-javafx {
-    version = "11.0.2"
-    modules = [ 'javafx.controls', 'javafx.fxml' ]
-}
-
-application {
-    // Change this to your main class.
-    mainClassName = "Duke"
-}
-
-run {
-    standardInput = System.in
-}
-dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
-}
-test {
-    useJUnitPlatform()
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
 }
diff --git a/build.gradle.orig b/build.gradle.orig
@@ -0,0 +1,92 @@
+<<<<<<< HEAD
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+=======
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+>>>>>>> master
+}
diff --git a/build_BACKUP_25837.gradle b/build_BACKUP_25837.gradle
@@ -0,0 +1,92 @@
+<<<<<<< HEAD
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+=======
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+>>>>>>> master
+}
diff --git a/build_BASE_25837.gradle b/build_BASE_25837.gradle
@@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Main"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+}
diff --git a/build_LOCAL_25837.gradle b/build_LOCAL_25837.gradle
@@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+checkstyle {
+    toolVersion = '8.23'
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveVersion = "0.1.3"
+    archiveClassifier = null
+    archiveAppendix = null
+}
+
+group 'seedu.duke'
+version '0.1.0'
+
+repositories {
+    mavenCentral()
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+application {
+    // Change this to your main class.
+    mainClassName = "Duke"
+}
+
+run {
+    standardInput = System.in
+}
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+}
+test {
+    useJUnitPlatform()
+}