Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
33c027f
Use dto for weather
varunsingh87 Jul 27, 2025
8d46dfb
merge
varunsingh87 Aug 1, 2025
198d072
Merge remote-tracking branch 'remotes/origin/main' into 218-spawner-a…
varunsingh87 Aug 1, 2025
6ba767b
#218 Remove peerListener dependency by Spawner, add more DTOs
varunsingh87 Aug 3, 2025
b912753
Add dtos for everything using write packet
varunsingh87 Aug 5, 2025
6f9e984
Finish creating DTOs for server and client, remove PeerListener.java
varunsingh87 Aug 20, 2025
a1a393c
Make playername a DTO record - last use of json value outside of play…
varunsingh87 Aug 22, 2025
d305c61
Write integration tests for newday and airportlist dtos
varunsingh87 Aug 24, 2025
c6c6dd6
rollback build.gradle change and upgrade GWT
varunsingh87 Aug 24, 2025
450a4a6
Use Array more
varunsingh87 Aug 25, 2025
df69326
Prove that it has to do with the upgrade not the changes
varunsingh87 Aug 25, 2025
75cfe8f
Fix gwt issue
varunsingh87 Aug 25, 2025
741049c
Merge branch 'fix-gwt-issue' into 218-spawner-and-network-related-tests
varunsingh87 Aug 25, 2025
26502c1
Use pre-Java 11 syntax to be compatible with GWT 2.11.0 (which is to …
varunsingh87 Aug 25, 2025
d118f41
a
varunsingh87 Aug 25, 2025
97099d9
Add inspection profiles
varunsingh87 Aug 26, 2025
bf3edb1
other changes
varunsingh87 Aug 26, 2025
5267300
Fix gwt with earlier plugin (#225)
varunsingh87 Aug 28, 2025
0575434
Correct workflows
varunsingh87 Aug 28, 2025
75421c8
Passtests
varunsingh87 Aug 28, 2025
69ec90f
Make IntelliJ and GWT both work in v2 of GWT GRadle plugin!
varunsingh87 Aug 28, 2025
4505fae
Add test for landing dto and some cleanup
varunsingh87 Aug 28, 2025
33aac45
Add integration and ui test gradle tasks and workflows
varunsingh87 Aug 28, 2025
abebedc
Put ci-build as workflow dispatch
varunsingh87 Aug 28, 2025
99483d1
Add tests for path removal, add more checks to DTO apply methods
varunsingh87 Aug 29, 2025
5b39530
Ensure paths are cleaned up correctly by moving logic to Inventory fa…
varunsingh87 Aug 30, 2025
e6bd583
Test Player#removeAIrportfromPathAndPossiblyRemovePath
varunsingh87 Aug 30, 2025
46acad6
Undo dumb name change
varunsingh87 Aug 30, 2025
7837076
Remove pull request trigger from ci-build. Fix env usage.
varunsingh87 Aug 30, 2025
fdb0470
Add badge to README
varunsingh87 Aug 30, 2025
406d144
Use parameterized test for unit test to generalize which airport is r…
varunsingh87 Aug 30, 2025
74946c3
Fix server
varunsingh87 Aug 30, 2025
881b241
#218 better deployment shell script
Datoneguy246 Aug 30, 2025
3eaec4a
#218 syntax fix
Datoneguy246 Aug 30, 2025
419a2bf
Fix script
varunsingh87 Aug 30, 2025
83a8825
#218 server logging
Datoneguy246 Aug 30, 2025
13bf04e
Merge remote-tracking branch 'origin/218-spawner-and-network-related-…
Datoneguy246 Aug 30, 2025
0dae9f1
Fix communication
varunsingh87 Aug 30, 2025
7badc1b
#218 top DTO fixes
Datoneguy246 Aug 30, 2025
b67008a
Merge remote-tracking branch 'origin/218-spawner-and-network-related-…
Datoneguy246 Aug 30, 2025
a460bf3
Bottom-up dto serialization compatibility
varunsingh87 Aug 30, 2025
ceaa12e
Merge remote-tracking branch 'origin/218-spawner-and-network-related-…
varunsingh87 Aug 30, 2025
ab3725e
Fix
varunsingh87 Aug 30, 2025
0a7ce06
Run server
varunsingh87 Aug 30, 2025
6b0a863
#218 openjdk 24 for server
Datoneguy246 Aug 30, 2025
09271b2
#218 openjdk 23 for server (psyche!)
Datoneguy246 Aug 30, 2025
e6ee698
#218 logging
Datoneguy246 Aug 30, 2025
77c2556
Fix map
varunsingh87 Aug 30, 2025
66f521b
Specify server for jar
varunsingh87 Aug 30, 2025
efb5c19
#218 parse error
Datoneguy246 Aug 30, 2025
22edbce
fix ghost plane regression
varunsingh87 Aug 30, 2025
1d67952
Fix update traffic
varunsingh87 Aug 31, 2025
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
46 changes: 35 additions & 11 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

env:
CLIENT_JDK_VERSION: '17'
CLIENT_JDK_DISTRIBUTION: 'temurin'

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
workflow_dispatch: {}

jobs:
build:
Expand All @@ -28,8 +27,8 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: ${{ clientJdkVersion }}
distribution: ${{ clientJavaDistribution }}
java-version: $CLIENT_JDK_VERSION
distribution: $CLIENT_JDK_DISTRIBUTION

# Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
Expand All @@ -39,6 +38,31 @@ jobs:
- name: Build with Gradle Wrapper
run: ./gradlew build

higherLevelTests:
strategy: # Create multiple job runs, each job on a different OS
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
permissions:
contents: read

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: $CLIENT_JDK_VERSION
distribution: $CLIENT_JDK_DISTRIBUTION

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run Integration Tests
run: ./gradlew integrationTests

- name: Run UI Tests
run: ./gradlew uiTests

# NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
# If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
#
Expand All @@ -58,11 +82,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ clientJdkVersion }}
- name: Set up JDK $CLIENT_JDK_VERSION
uses: actions/setup-java@v4
with:
java-version: ${{ clientJdkVersion }}
distribution: ${{ clientJavaDistribution }}
java-version: $CLIENT_JDK_VERSION
distribution: $CLIENT_JDK_DISTRIBUTION

# Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
# See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/gated-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Java Gated Build with Gradle

env:
clientJdkVersion: '17'
clientJdkDistrib: 'temurin'

on:
push:
branches:
Expand All @@ -22,12 +26,12 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: ${{ clientJdkVersion }}
distribution: ${{ clientJavaDistribution }}
java-version: ${{ env.clientJdkVersion }}
distribution: ${{ env.clientJdkDistrib }}
cache: 'gradle'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run Gradle unit tests
run: ./gradlew test
run: ./gradlew unitTests
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ www-test/
.gwt-tmp/

## IntelliJ, Android Studio:
.idea/
# Ignore all files and subdirectories inside .idea folder
.idea/*/*
.idea/*.xml
*.ipr
*.iws
*.iml
# Except inspectionProfiles, which should be included for a synchronized code style
!.idea/inspectionProfiles/*

## Eclipse:
.classpath
Expand Down
23 changes: 23 additions & 0 deletions .idea/inspectionProfiles/Full_Project_Safe.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/inspectionProfiles/GWT_Limited__Mid_Era_Java_Syntax_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading