From a272a3498773f061dd9d4cfc8f6870e7afab3e52 Mon Sep 17 00:00:00 2001 From: "taggyhan123@Gmail.com" Date: Fri, 8 Nov 2024 01:29:08 +0800 Subject: [PATCH 1/3] fix gradle --- build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1d294ec23d2..1da6df8fdcc 100644 --- a/build.gradle +++ b/build.gradle @@ -44,24 +44,31 @@ dependencies { String jUnitVersion = '5.4.0' String javaFxVersion = '17.0.7' + // JavaFX dependencies for Windows, macOS (Intel and ARM), and Linux implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' 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' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion } From 410959cb795dc0f78d255bb905fe89015296a058 Mon Sep 17 00:00:00 2001 From: "taggyhan123@Gmail.com" Date: Fri, 8 Nov 2024 01:36:09 +0800 Subject: [PATCH 2/3] fix style --- build.gradle | 6 +++--- docs/DeveloperGuide.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1da6df8fdcc..a741ecc7cea 100644 --- a/build.gradle +++ b/build.gradle @@ -49,17 +49,17 @@ dependencies { implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac-aarch64' diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 4be906b67cb..f621f49af94 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -475,7 +475,7 @@ None. 6. **Tag:**\ Labels or categories assigned to members in Hall Pointer (e.g., `leader`, `active`, `inactive`). Tags help classify and manage members more easily. - + 7. **Command:**\ A user-entered instruction (e.g., `add_member`) in the CLI, enabling various operations within HallPointer. Commands are processed by the `Logic` component. @@ -545,7 +545,7 @@ testers are expected to do more _exploratory_ testing. 1. Prerequisites: List all members using the `list_members` command. Multiple members in the list. 2. Test case: `delete_member 1`
- **Expected:** First contact is deleted from the list. Details of the deleted contact are shown in the status message. + **Expected:** First contact is deleted from the list. Details of the deleted contact are shown in the status message. 3. Test case: `delete_member 0`
**Expected:** No member is deleted. Error details shown in the status message. From 40ef9f3fac731c436a7613c202be0082f6bd52cb Mon Sep 17 00:00:00 2001 From: "taggyhan123@Gmail.com" Date: Fri, 8 Nov 2024 02:13:15 +0800 Subject: [PATCH 3/3] fix gradle --- build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a741ecc7cea..9e8649cf1cf 100644 --- a/build.gradle +++ b/build.gradle @@ -49,17 +49,17 @@ dependencies { implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac-aarch64' implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' - + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac-aarch64' @@ -70,15 +70,16 @@ dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion -} - -shadowJar { - archiveBaseName = 'hallpointer' - archiveClassifier = null + testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.4.0' } + run { enableAssertions = true } +shadowJar { + archiveFileName = 'hallpointer.jar' +} + defaultTasks 'clean', 'test'