Skip to content

Commit bda42f3

Browse files
tommyettingertommyettinger
committed
Get DawnSquad working with latest jdkgdxds.
1 parent 6749385 commit bda42f3

Some content is hidden

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

45 files changed

+17238
-17
lines changed

‎SquidSquad/DawnSquad/core/build.gradle

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,40 @@ dependencies {
1313
// api "com.squidpony:squidpath:$squidSquadVersion"
1414
// api "com.squidpony:squidtext:$squidSquadVersion"
1515
// api "com.squidpony:squidsmooth:$squidSquadVersion"
16-
api "com.github.yellowstonegames.squidsquad:squidcore:$squidSquadVersion"
17-
api "com.github.yellowstonegames.squidsquad:squidgrid:$squidSquadVersion"
18-
api "com.github.yellowstonegames.squidsquad:squidplace:$squidSquadVersion"
19-
api "com.github.yellowstonegames.squidsquad:squidpath:$squidSquadVersion"
20-
api "com.github.yellowstonegames.squidsquad:squidtext:$squidSquadVersion"
21-
api "com.github.yellowstonegames.squidsquad:squidsmooth:$squidSquadVersion"
16+
api("com.github.yellowstonegames.squidsquad:squidcore:$squidSquadVersion"){
17+
exclude module: 'jdkgdxds'
18+
exclude module: 'juniper'
19+
exclude module: 'digital'
20+
}
21+
api("com.github.yellowstonegames.squidsquad:squidgrid:$squidSquadVersion"){
22+
exclude module: 'jdkgdxds'
23+
exclude module: 'juniper'
24+
exclude module: 'digital'
25+
}
26+
api("com.github.yellowstonegames.squidsquad:squidplace:$squidSquadVersion"){
27+
exclude module: 'jdkgdxds'
28+
exclude module: 'juniper'
29+
exclude module: 'digital'
30+
}
31+
api("com.github.yellowstonegames.squidsquad:squidpath:$squidSquadVersion"){
32+
exclude module: 'jdkgdxds'
33+
exclude module: 'juniper'
34+
exclude module: 'digital'
35+
}
36+
api("com.github.yellowstonegames.squidsquad:squidtext:$squidSquadVersion"){
37+
exclude module: 'jdkgdxds'
38+
exclude module: 'juniper'
39+
exclude module: 'digital'
40+
}
41+
api("com.github.yellowstonegames.squidsquad:squidsmooth:$squidSquadVersion"){
42+
exclude module: 'jdkgdxds'
43+
exclude module: 'juniper'
44+
exclude module: 'digital'
45+
}
46+
api "com.github.tommyettinger:digital:$digitalVersion"
47+
api "com.github.tommyettinger:funderby:$funderbyVersion"
48+
api "com.github.tommyettinger:jdkgdxds:$jdkgdxdsVersion"
49+
api "com.github.tommyettinger:juniper:$juniperVersion"
2250

2351
if(enableGraalNative == 'true') {
2452
implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"

‎SquidSquad/DawnSquad/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ gwtFrameworkVersion=2.11.0
1111
gwtPluginVersion=1.1.29
1212
digitalVersion=0.6.2
1313
juniperVersion=0.6.7
14-
jdkgdxdsVersion=1.8.1
1514
regexodusVersion=0.1.19
15+
funderbyVersion=0.1.2
16+
jdkgdxdsVersion=1.10.1
1617
squidSquadVersion=81df56d994
1718
#squidSquadVersion=9f41d7b883
1819
#squidSquadVersion=d3224c1abe

‎SquidSquad/DawnSquad/html/build.gradle

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation "com.github.tommyettinger:juniper:$juniperVersion:sources"
4141
implementation "com.github.tommyettinger:jdkgdxds:$jdkgdxdsVersion:sources"
4242
implementation "com.github.tommyettinger:crux:0.1.2:sources"
43-
implementation "com.github.tommyettinger:funderby:0.1.2:sources"
43+
implementation "com.github.tommyettinger:funderby:$funderbyVersion:sources"
4444
implementation "com.github.tommyettinger:regexodus:$regexodusVersion:sources"
4545

4646
// implementation "com.squidpony:squidcore:$squidSquadVersion:sources"
@@ -50,12 +50,36 @@ dependencies {
5050
// implementation "com.squidpony:squidtext:$squidSquadVersion:sources"
5151
// implementation "com.squidpony:squidsmooth:$squidSquadVersion:sources"
5252

53-
implementation "com.github.yellowstonegames.squidsquad:squidcore:$squidSquadVersion:sources"
54-
implementation "com.github.yellowstonegames.squidsquad:squidgrid:$squidSquadVersion:sources"
55-
implementation "com.github.yellowstonegames.squidsquad:squidplace:$squidSquadVersion:sources"
56-
implementation "com.github.yellowstonegames.squidsquad:squidpath:$squidSquadVersion:sources"
57-
implementation "com.github.yellowstonegames.squidsquad:squidtext:$squidSquadVersion:sources"
58-
implementation "com.github.yellowstonegames.squidsquad:squidsmooth:$squidSquadVersion:sources"
53+
implementation("com.github.yellowstonegames.squidsquad:squidcore:$squidSquadVersion:sources"){
54+
exclude module: 'jdkgdxds'
55+
exclude module: 'juniper'
56+
exclude module: 'digital'
57+
}
58+
implementation("com.github.yellowstonegames.squidsquad:squidgrid:$squidSquadVersion:sources"){
59+
exclude module: 'jdkgdxds'
60+
exclude module: 'juniper'
61+
exclude module: 'digital'
62+
}
63+
implementation("com.github.yellowstonegames.squidsquad:squidplace:$squidSquadVersion:sources"){
64+
exclude module: 'jdkgdxds'
65+
exclude module: 'juniper'
66+
exclude module: 'digital'
67+
}
68+
implementation("com.github.yellowstonegames.squidsquad:squidpath:$squidSquadVersion:sources"){
69+
exclude module: 'jdkgdxds'
70+
exclude module: 'juniper'
71+
exclude module: 'digital'
72+
}
73+
implementation("com.github.yellowstonegames.squidsquad:squidtext:$squidSquadVersion:sources"){
74+
exclude module: 'jdkgdxds'
75+
exclude module: 'juniper'
76+
exclude module: 'digital'
77+
}
78+
implementation("com.github.yellowstonegames.squidsquad:squidsmooth:$squidSquadVersion:sources"){
79+
exclude module: 'jdkgdxds'
80+
exclude module: 'juniper'
81+
exclude module: 'digital'
82+
}
5983

6084
// implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion"
6185
// implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion:sources"

‎docs/squidsquad/dawnsquad-april-2025/WEB-INF/deploy/html/rpcPolicyManifest/manifest.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Module html
2+
# RPC service class, partial path of RPC policy file

‎docs/squidsquad/dawnsquad-april-2025/WEB-INF/web.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" ?>
2+
<web-app>
3+
</web-app>

‎docs/squidsquad/dawnsquad-april-2025/assets/assets-589ede168a46e8bb6a633f1ed79ce87a.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dawnlike/Dawnlike-license.txt
2+
dawnlike/Dawnlike.atlas
3+
dawnlike/Dawnlike.png
4+
dawnlike/font.fnt

‎docs/squidsquad/dawnsquad-april-2025/assets/assets.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
d:assets:assets:0:application/unknown:1
2+
t:assets.txt:assets-589ede168a46e8bb6a633f1ed79ce87a.txt:94:text/plain:1
3+
d:dawnlike:dawnlike:0:application/unknown:1
4+
t:dawnlike/Dawnlike-license.txt:dawnlike/Dawnlike-license-ea64186a642543d86c8f7600285eb631.txt:860:text/plain:1
5+
t:dawnlike/Dawnlike.atlas:dawnlike/Dawnlike-bd7f350ccbc0c21419d959f6b8ce4636.atlas:233601:application/unknown:1
6+
i:dawnlike/Dawnlike.png:dawnlike/Dawnlike-6d35d6582def10876c722c3b7c85d897.png:442906:image/png:1
7+
t:dawnlike/font.fnt:dawnlike/font-14a9bae2e82922e849b834b7cda1eb0a.fnt:19286:application/unknown:1
8+
t:com/badlogic/gdx/graphics/g3d/particles/particles.fragment.glsl:particles.fragment-b90524761fdf09b0a836056d590c30b8.glsl:820:application/unknown:1
9+
t:com/badlogic/gdx/graphics/g3d/particles/particles.vertex.glsl:particles.vertex-f25b8b2fae10b9bfa09bfdd484923148.glsl:2886:application/unknown:1
10+
t:com/badlogic/gdx/graphics/g3d/shaders/default.fragment.glsl:default.fragment-e1c018bd48044c8b67c7bbc53145e540.glsl:5874:application/unknown:1
11+
t:com/badlogic/gdx/graphics/g3d/shaders/default.vertex.glsl:default.vertex-28b7e77ea3f282ebd5b066ba256692c3.glsl:9096:application/unknown:1
12+
t:com/badlogic/gdx/graphics/g3d/shaders/depth.fragment.glsl:depth.fragment-8341d5ce47fc398da575c9e294b6821b.glsl:869:application/unknown:1
13+
t:com/badlogic/gdx/graphics/g3d/shaders/depth.vertex.glsl:depth.vertex-98a450f1f747c05eedb7122779187316.glsl:2931:application/unknown:1
14+
t:com/badlogic/gdx/utils/lsans-15.fnt:lsans-15-5143ae9583bc43b1084f98062e054ae8.fnt:17711:application/unknown:1
15+
i:com/badlogic/gdx/utils/lsans-15.png:lsans-15-8e00ff5b9dd15a3c18c1eb75f68c695a.png:10270:image/png:1

‎docs/squidsquad/dawnsquad-april-2025/assets/dawnlike/Dawnlike-6d35d6582def10876c722c3b7c85d897.png

433 KB
Loading

0 commit comments

Comments
 (0)