Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PeterHW963] iP #641

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
68c58c1
Add Gradle support
May 24, 2020
03523ec
Bump gradle and lib version
Eclipse-Dominator Aug 5, 2023
81a9c53
build.gradle: Prevent generating a second JAR file
aureliony Jul 16, 2024
ee22922
Change Duke.java to Nether.java
PeterHW963 Aug 21, 2024
e8f5b59
Add Echo feature until user inputs "bye"
PeterHW963 Aug 21, 2024
31e47ee
Add "Add" and "List" features and refactored code
PeterHW963 Aug 21, 2024
9aff95d
Add Mark/Unmark as Done and refactor code
PeterHW963 Aug 21, 2024
efe780f
Add ToDos, Events, Deadlines
PeterHW963 Aug 21, 2024
c757e10
Add Error handling and text UI testing
PeterHW963 Aug 21, 2024
59438af
Add delete task
PeterHW963 Aug 21, 2024
ba333ad
Add Save data
PeterHW963 Aug 26, 2024
1ff1111
Attempt to rectify branching mistake
PeterHW963 Aug 26, 2024
9b1ab4a
Merge branch 'branch-level-7'
PeterHW963 Aug 26, 2024
b03eb21
Add Dates and Times
PeterHW963 Aug 26, 2024
38a7a79
Merge branch 'branch-level-8'
PeterHW963 Aug 26, 2024
0fb4e68
Refactor code using more OOP
PeterHW963 Aug 27, 2024
87c44d2
Merge branch 'branch-moreOOP'
PeterHW963 Aug 27, 2024
b2f560d
Organize into packages
PeterHW963 Aug 27, 2024
35853d5
Merge branch 'branch-packages'
PeterHW963 Aug 27, 2024
bee9ed5
Merge branch 'add-gradle-support'
PeterHW963 Aug 27, 2024
f425921
Change gradle build configuration
PeterHW963 Aug 27, 2024
87c378d
Merge branch 'branch-gradle'
PeterHW963 Aug 27, 2024
01acfe0
Add JUnit Tests
PeterHW963 Aug 29, 2024
a5db4fb
Merge branch 'branch-JUnit'
PeterHW963 Aug 29, 2024
09706c9
Create a JAR File
PeterHW963 Aug 29, 2024
2e76619
Merge branch 'branch-Jar'
PeterHW963 Aug 29, 2024
e292160
Add JavaDoc style documentation
PeterHW963 Aug 29, 2024
edfdd62
Follow the Coding Standard
PeterHW963 Aug 29, 2024
5b190f3
Add find function
PeterHW963 Aug 30, 2024
e9919a5
Merge branch 'branch-A-JavaDoc'
PeterHW963 Aug 30, 2024
c1d57cc
Merge branch 'branch-A-CodingStandard'
PeterHW963 Aug 30, 2024
7b9899b
Merge branch 'branch-Level-9'
PeterHW963 Aug 30, 2024
9a47167
Use CheckStyle
PeterHW963 Sep 4, 2024
2241452
Merge branch 'branch-checkstyle'
PeterHW963 Sep 4, 2024
dc0e6e0
Prepare for GUI implementation
PeterHW963 Sep 4, 2024
a7db0f7
Add GUI
PeterHW963 Sep 5, 2024
d320b76
Merge branch 'branch-level-10'
PeterHW963 Sep 5, 2024
ae521bd
Change style of Window and misc changes
PeterHW963 Sep 5, 2024
b548a95
Ensure JUnit Tests are still passed
PeterHW963 Sep 6, 2024
cfebbe4
Create guard case for list command
PeterHW963 Sep 11, 2024
720cdf6
Add assertions
PeterHW963 Sep 11, 2024
9a123ac
Improve Code Quality
PeterHW963 Sep 11, 2024
321dc8c
Use streams
PeterHW963 Sep 11, 2024
6b08eee
Merge pull request #2 from PeterHW963/branch-A-CodeQuality
PeterHW963 Sep 11, 2024
7aea476
Merge branch 'master' into branch-A-Assertions
PeterHW963 Sep 11, 2024
a7b4af5
Merge pull request #1 from PeterHW963/branch-A-Assertions
PeterHW963 Sep 11, 2024
451d228
Solve issues with data file again
PeterHW963 Sep 11, 2024
d93bc26
Merge branch 'master' into branch-A-Streams
PeterHW963 Sep 11, 2024
162c21f
Merge pull request #3 from PeterHW963/branch-A-Streams
PeterHW963 Sep 11, 2024
9a761aa
Merge branch 'master' of https://github.com/PeterHW963/ip
PeterHW963 Sep 11, 2024
21c35b0
Set up CI
PeterHW963 Sep 13, 2024
ca06248
Merge branch 'Branch-A-CI'
PeterHW963 Sep 13, 2024
21248a6
Fix .yaml file
PeterHW963 Sep 18, 2024
af848c4
Copy FXML from guide
PeterHW963 Sep 18, 2024
8d9ce40
Finish implementing CSS for GUI
PeterHW963 Sep 18, 2024
98bf759
Add C-Tagging extension
PeterHW963 Sep 18, 2024
8ce2e2c
Implement Better GUI
PeterHW963 Sep 18, 2024
4b6c31d
Add a unique personality
PeterHW963 Sep 18, 2024
baba855
Fix style for CI
PeterHW963 Sep 18, 2024
743415f
Fix for CI (pt2)
PeterHW963 Sep 19, 2024
397075f
Fix for CI and upload Ui.png
PeterHW963 Sep 19, 2024
a47aeac
Fix CI (pt4)
PeterHW963 Sep 19, 2024
f17eea0
Add tag finding and start README
PeterHW963 Sep 19, 2024
a6903a2
Update README.md
PeterHW963 Sep 19, 2024
198d23f
Ready for release
PeterHW963 Sep 19, 2024
9091e77
WALLAH LAST FIX FOR CI
PeterHW963 Sep 19, 2024
d24d3fa
Remove old README and add acknowledgements to current README
PeterHW963 Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Java CI

on: [push, pull_request]

jobs:
build:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Set up repository
uses: actions/checkout@master

- name: Set up repository
uses: actions/checkout@master
with:
ref: master

- name: Merge to master
run: git checkout --progress --force ${{ github.sha }}

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: '17'
java-package: jdk+fx

- name: Build and check with Gradle
run: ./gradlew check

# NO NEED FOR TEXT UI TESTING ANYMORE
# - name: Perform IO redirection test (*NIX)
# if: runner.os == 'Linux'
# working-directory: ${{ github.workspace }}/text-ui-test
# run: ./runtest.sh
#
# - name: Perform IO redirection test (MacOS)
# if: always() && runner.os == 'macOS'
# working-directory: ${{ github.workspace }}/text-ui-test
# run: ./runtest.sh
#
# - name: Perform IO redirection test (Windows)
# if: always() && runner.os == 'Windows'
# working-directory: ${{ github.workspace }}/text-ui-test
# shell: cmd
# run: runtest.bat
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
jar-test/Nether.jar-all.jar
jar-test/Instructions
24 changes: 0 additions & 24 deletions README.md

This file was deleted.

81 changes: 81 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
plugins {
id 'checkstyle'
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}

repositories {
mavenCentral()
}

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
String javaFxVersion = '17.0.7'

// implementation 'com.google.guava:guava:33.0-jre'
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: '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: '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: '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: 'linux'
}

test {
useJUnitPlatform()
jvmArgs '-ea'

testLogging {
events "passed", "skipped", "failed"

showExceptions true
exceptionFormat "full"
showCauses true
showStackTraces true
showStandardStreams = false
}
}

checkstyle {
toolVersion = '10.12.7'
configDirectory = file("$rootDir/config/checkstyle")
}

configurations.checkstyle {
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
select("com.google.guava:guava:0")
}
}

tasks.withType(Checkstyle).configureEach {
reports {
xml.required = true
html.required = true // Enable the HTML report
}
}

application {
mainClass.set("Launcher")
}

shadowJar {
archiveBaseName = "Nether.jar"
// archiveClassifier = null
}

run{
jvmArgs '-ea'
standardInput = System.in
jvmArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'javafx.controls,javafx.fxml'
]
}
Loading