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

App <-> Backend socket connection #37

Merged
merged 38 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0957d76
socketing
xxAROX Jan 4, 2024
bb84c31
working
xxAROX Jan 6, 2024
3ff392f
bump version
xxAROX Jan 6, 2024
3f6fe93
more progress
xxAROX Jan 6, 2024
7e864a4
new rpc lib
xxAROX Jan 7, 2024
ee66cbd
more stuff
xxAROX Jan 7, 2024
6b8f224
removed hello packet
xxAROX Jan 7, 2024
d48fcff
Merge branch 'main' into socketing
xxAROX Jan 12, 2024
bfb94c8
test
xxAROX Jan 17, 2024
e526eb9
Aktualisieren von README.md
xxAROX Jan 19, 2024
6723ff1
Little changes
xxAROX Jan 20, 2024
10666d5
Added License
xxAROX Jan 20, 2024
9cb037e
Updated README.md
xxAROX Jan 20, 2024
f784f71
Added better logging console
xxAROX Jan 21, 2024
187ebf2
Split events to a class instead of methods
xxAROX Jan 21, 2024
cf0c883
removed debug stuff
xxAROX Jan 21, 2024
b3c272a
Updated version
xxAROX Jan 21, 2024
d0fa088
cleaner
xxAROX Jan 21, 2024
727eaf8
Merge branch 'main' into socketing
xxAROX Jan 22, 2024
8ac5d2a
More clean
xxAROX Jan 22, 2024
c42e52c
Fixed socket shit
xxAROX Jan 22, 2024
5054734
added -dev shit
xxAROX Jan 23, 2024
6a94151
Update dev-build.yml - ci ignore
xxAROX Jan 23, 2024
d49bc91
Merge remote-tracking branch 'origin/socketing' into socketing
xxAROX Jan 24, 2024
cdedd5d
whoops
xxAROX Jan 24, 2024
9f9f9d4
Sockets are communicating
xxAROX Jan 24, 2024
85802dd
working sockets
xxAROX Feb 13, 2024
4f868eb
Merge branch 'main' into socketing
xxAROX Feb 13, 2024
b2ac927
better now
xxAROX Feb 14, 2024
ef1c690
better now
xxAROX Feb 14, 2024
c17a988
working
xxAROX Feb 14, 2024
04c4bbc
repo renamed from releases to Gateway
xxAROX Feb 17, 2024
62c6750
-> repo renamed from releases to Gateway
xxAROX Feb 17, 2024
a4a7a7c
bump version
xxAROX Feb 17, 2024
b982f24
whoopy
xxAROX Feb 17, 2024
e8675c1
tray menu
xxAROX Feb 17, 2024
f187cdb
removed minimize icon
xxAROX Feb 17, 2024
f2ce087
Merge branch 'main' of https://github.com/Presence-Man/Application in…
xxAROX Feb 17, 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
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/java
{
"name": "Java",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",

"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "none",
"installMaven": "true",
"installGradle": "false"
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "java -version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Release development"

on:
push:
branches: [ "development" ]
branches: [ "development", "socketing" ]

jobs:
build:
Expand All @@ -23,7 +23,7 @@ jobs:
id: metadata
run: |
javac -d . src/main/java/xxAROX/PresenceMan/Application/AppInfo.java
echo "VERSION=$(java xxAROX.PresenceMan.Application.AppInfo)" >> $GITHUB_OUTPUT
echo "VERSION=$(java xxAROX.PresenceMan.Application.AppInfo development)" >> $GITHUB_OUTPUT
echo ${{ steps.metadata.outputs.VERSION }}

- name: Build with Maven
Expand All @@ -46,13 +46,14 @@ jobs:
automatic_release_tag: "v${{ steps.metadata.outputs.VERSION }}"
prerelease: false
title: "Development Release v${{ steps.metadata.outputs.VERSION }}"
files: "target/Presence-Man-App-v${{ steps.metadata.outputs.VERSION }}-dev.jar"
files: "target/Presence-Man-App.jar"

- name: Release to public
uses: softprops/action-gh-release@v1
- name: "Create latest_version-dev.txt"
run: "echo \"${{ steps.metadata.outputs.VERSION }}\" > latest_version-dev.txt"

- name: "Update version-dev.txt"
uses: "test-room-7/action-update-file@v1"
with:
tag_name: "latest"
name: "Latest releases"
repository: "Presence-Man/releases"
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
files: "target/Presence-Man-App-dev.jar"
file-path: latest_version-dev.txt
commit-msg: "Updated development version to ${{ steps.metadata.outputs.VERSION }} - ci ignore"
github-token: ${{ secrets.GITHUB_TOKEN }}
30 changes: 8 additions & 22 deletions .github/workflows/build.yml → .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,14 @@ jobs:
automatic_release_tag: "v${{ steps.metadata.outputs.VERSION }}"
prerelease: false
title: "Release v${{ steps.metadata.outputs.VERSION }}"
files: "target/Presence-Man-App-v${{ steps.metadata.outputs.VERSION }}.jar"

- name: "Create version-app.txt"
run: "echo \"${{ steps.metadata.outputs.VERSION }}\" >> version-app.txt"
files: "target/Presence-Man-App.jar"

- name: "Pushes latest version-app.txt file"
uses: dmnemec/copy_file_to_another_repo_action@main
env:
API_TOKEN_GITHUB: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
with:
source_file: 'version-app.txt'
destination_repo: 'Presence-Man/releases'
destination_folder: ''
user_email: 'arox.email.0@gmail.com'
user_name: 'xxAROX'
commit_message: 'Updated version'
- name: "Create latest_version.txt"
run: "echo \"${{ steps.metadata.outputs.VERSION }}\" > latest_version.txt"

- name: Release to public
uses: softprops/action-gh-release@v1
- name: "Update latest_version.txt"
uses: "test-room-7/action-update-file@v1"
with:
tag_name: "latest"
name: "Latest releases"
repository: "Presence-Man/releases"
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
files: "target/Presence-Man-App.jar"
file-path: latest_version.txt
commit-msg: "Updated latest version to ${{ steps.metadata.outputs.VERSION }} - ci ignore"
github-token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 6 additions & 0 deletions .idea/copyright/Jan_Michael_Sohn___xxAROX.xml

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

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

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

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

33 changes: 33 additions & 0 deletions .idea/runConfigurations/Build.xml

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

10 changes: 10 additions & 0 deletions .idea/runConfigurations/Run__Development.xml

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

9 changes: 9 additions & 0 deletions .idea/runConfigurations/Run__Production.xml

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

Loading
Loading