Skip to content

Commit 525a66a

Browse files
thelsingthelsing
committed
Merge remote-tracking branch 'upstream/develop' into feature-mod2
# Conflicts: # build.gradle # src/main/java/net/rptools/maptool/client/tool/DefaultTool.java # src/main/java/net/rptools/maptool/client/tool/PointerTool.java # src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java # src/main/java/net/rptools/maptool/model/ZoneFactory.java # src/main/java/net/rptools/maptool/util/StringUtil.java # src/main/resources/net/rptools/maptool/client/ui/forms/connectToServerDialog.xml
2 parents d50afc2 + 4f2f47c commit 525a66a

397 files changed

Lines changed: 11374 additions & 72829 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish.yml‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ jobs:
3333
distribution: 'temurin'
3434
java-version: ${{ matrix.java }}
3535
- name: Cache Gradle
36-
uses: actions/cache@v3
37-
# Cache only seems to work on ubuntu right now...
38-
if: matrix.os == 'ubuntu-latest'
36+
uses: actions/cache@v4
3937
with:
4038
path: ~/.gradle/caches
4139
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
4240
restore-keys: |
4341
${{ runner.os }}-gradle-
4442
- name: Build with Gradle
45-
run: ./gradlew jpackage
43+
run: ./gradlew jpackage zipJpackageImage
4644
- name: Copy the RPM to the location required to build the ArchLinux package
4745
if: matrix.os == 'ubuntu-latest'
4846
run: cp releases/maptool-*.rpm package/archlinux/maptool/maptool.rpm
@@ -71,8 +69,11 @@ jobs:
7169
- name: Rename Windows Release Files
7270
if: matrix.os == 'windows-latest'
7371
run: |
74-
mv releases/MapTool*.exe releases/MapTool-${{ github.event.release.tag_name }}.exe
75-
mv releases/MapTool*.msi releases/MapTool-${{ github.event.release.tag_name }}.msi
72+
mkdir releases/renamed/
73+
cp releases/MapTool*.exe releases/renamed/MapTool-${{ github.event.release.tag_name }}.exe
74+
cp releases/MapTool*.msi releases/renamed/MapTool-${{ github.event.release.tag_name }}.msi
75+
cp releases/MapTool*.jar releases/renamed/MapTool-${{ github.event.release.tag_name }}.jar
76+
cp releases/MapTool*-win.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-win.zip
7677
continue-on-error: true
7778
- name: Upload Windows EXE Release Asset
7879
id: upload-release-asset-exe
@@ -82,7 +83,7 @@ jobs:
8283
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8384
with:
8485
upload_url: ${{ github.event.release.upload_url }}
85-
asset_path: releases/MapTool-${{ github.event.release.tag_name }}.exe
86+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.exe
8687
asset_name: MapTool-${{ github.event.release.tag_name }}.exe
8788
asset_content_type: application/octet-stream
8889
- name: Upload Windows MSI Release Asset
@@ -93,9 +94,20 @@ jobs:
9394
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9495
with:
9596
upload_url: ${{ github.event.release.upload_url }}
96-
asset_path: releases/MapTool-${{ github.event.release.tag_name }}.msi
97+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.msi
9798
asset_name: MapTool-${{ github.event.release.tag_name }}.msi
9899
asset_content_type: application/octet-stream
100+
- name: Upload Windows Image Release Asset
101+
id: upload-release-asset-windows-image
102+
uses: actions/upload-release-asset@v1
103+
if: matrix.os == 'windows-latest'
104+
env:
105+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106+
with:
107+
upload_url: ${{ github.event.release.upload_url }}
108+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-win.zip
109+
asset_name: MapTool-${{ github.event.release.tag_name }}-win.zip
110+
asset_content_type: application/octet-stream
99111
- name: Upload Uber Jar Release Asset
100112
id: upload-release-asset-jar
101113
uses: actions/upload-release-asset@v1
@@ -104,7 +116,7 @@ jobs:
104116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
105117
with:
106118
upload_url: ${{ github.event.release.upload_url }}
107-
asset_path: releases/MapTool-${{ github.event.release.tag_name }}.jar
119+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.jar
108120
asset_name: MapTool-${{ github.event.release.tag_name }}.jar
109121
asset_content_type: application/octet-stream
110122
# __ _
@@ -116,9 +128,11 @@ jobs:
116128
- name: Rename Linux Release Files
117129
if: matrix.os == 'ubuntu-latest'
118130
run: |
119-
mv -n releases/maptool*.x86_64.rpm releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
120-
mv -n releases/maptool*_amd64.deb releases/maptool_${{ github.event.release.tag_name }}_amd64.deb
121-
mv -n package/archlinux/maptool/maptool-*-x86_64.pkg.tar.zst releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
131+
mkdir releases/renamed/
132+
cp releases/maptool*.x86_64.rpm releases/renamed/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
133+
cp releases/maptool*_amd64.deb releases/renamed/maptool_${{ github.event.release.tag_name }}_amd64.deb
134+
find package/archlinux/maptool/ -maxdepth 1 -type f -name 'maptool-*-x86_64.pkg.tar.zst' -not -name '*debug*' -exec cp {} releases/renamed/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst \;
135+
cp releases/MapTool*-linux.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-linux.zip
122136
continue-on-error: true
123137
- name: Upload Linux RPM Release Asset
124138
id: upload-release-asset-rpm
@@ -128,7 +142,7 @@ jobs:
128142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
129143
with:
130144
upload_url: ${{ github.event.release.upload_url }}
131-
asset_path: releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
145+
asset_path: releases/renamed/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
132146
asset_name: maptool-${{ github.event.release.tag_name }}-x86_64.rpm
133147
asset_content_type: application/octet-stream
134148
- name: Upload Linux DEB Release Asset
@@ -139,7 +153,7 @@ jobs:
139153
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140154
with:
141155
upload_url: ${{ github.event.release.upload_url }}
142-
asset_path: releases/maptool_${{ github.event.release.tag_name }}_amd64.deb
156+
asset_path: releases/renamed/maptool_${{ github.event.release.tag_name }}_amd64.deb
143157
asset_name: maptool_${{ github.event.release.tag_name }}-amd64.deb
144158
asset_content_type: application/octet-stream
145159
- name: Upload ArchLinux Release Asset
@@ -150,9 +164,20 @@ jobs:
150164
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151165
with:
152166
upload_url: ${{ github.event.release.upload_url }}
153-
asset_path: releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
167+
asset_path: releases/renamed/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
154168
asset_name: maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
155169
asset_content_type: application/octet-stream
170+
- name: Upload Linux Image Release Asset
171+
id: upload-release-asset-linux-image
172+
uses: actions/upload-release-asset@v1
173+
if: matrix.os == 'ubuntu-latest'
174+
env:
175+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
176+
with:
177+
upload_url: ${{ github.event.release.upload_url }}
178+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-linux.zip
179+
asset_name: MapTool-${{ github.event.release.tag_name }}-linux.zip
180+
asset_content_type: application/octet-stream
156181
# ____ _____
157182
# ____ ___ ____ _ _____ / __ \/ ___/
158183
# / __ `__ \ / __ `// ___// / / /\__ \
@@ -162,8 +187,10 @@ jobs:
162187
- name: Rename Mac OS Release Files
163188
if: matrix.os == 'macOS-13'
164189
run: |
165-
mv releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg
166-
mv releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg
190+
mkdir releases/renamed/
191+
cp releases/MapTool*.dmg releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
192+
cp releases/MapTool*.pkg releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
193+
cp releases/MapTool*-mac.app.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
167194
continue-on-error: true
168195
- name: Upload Mac DMG Release Asset
169196
id: upload-release-asset-dmg
@@ -173,7 +200,7 @@ jobs:
173200
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174201
with:
175202
upload_url: ${{ github.event.release.upload_url }}
176-
asset_path: releases/MapTool-${{ github.event.release.tag_name }}.dmg
203+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
177204
asset_name: MapTool-${{ github.event.release.tag_name }}.dmg
178205
asset_content_type: application/octet-stream
179206
- name: Upload Mac PKG Release Asset
@@ -184,6 +211,17 @@ jobs:
184211
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
185212
with:
186213
upload_url: ${{ github.event.release.upload_url }}
187-
asset_path: releases/MapTool-${{ github.event.release.tag_name }}.pkg
214+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
188215
asset_name: MapTool-${{ github.event.release.tag_name }}.pkg
189216
asset_content_type: application/octet-stream
217+
- name: Upload Mac Image Release Asset
218+
id: upload-release-asset-mac-image
219+
uses: actions/upload-release-asset@v1
220+
if: matrix.os == 'macOS-13'
221+
env:
222+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
223+
with:
224+
upload_url: ${{ github.event.release.upload_url }}
225+
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
226+
asset_name: MapTool-${{ github.event.release.tag_name }}-mac.app.zip
227+
asset_content_type: application/octet-stream

‎.github/workflows/verify-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
java-version: ${{ matrix.java }}
5151
distribution: ${{ matrix.distribution }}
5252
- name: Cache Gradle
53-
uses: actions/cache@v3
53+
uses: actions/cache@v4
5454
with:
5555
path: ~/.gradle/caches
5656
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ out/
2626
# Automatically Generated
2727
################################################################################
2828
package/windows/MapTool.iss
29+
package/linux/MapTool*.desktop
2930

3031

3132
# IDEs

0 commit comments

Comments
 (0)