Attempt to update to latest simpler Squid dep.

This fails for some reason involving transitive dependencies. I don't understand it yet.
yellowstonegames · Oct 6, 2023 · c2b7492 · c2b7492
1 parent be5c39b
commit c2b7492
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/SquidSquad/DawnSquad/gradle.properties b/SquidSquad/DawnSquad/gradle.properties
@@ -9,10 +9,11 @@ gdxBackendsVersion=1.1200.1
 graalHelperVersion=c82cf80440
 graalvmVersion=22.3.1
 gwtFrameworkVersion=2.10.0
-digitalVersion=0.4.0
-juniperVersion=0.3.9
-jdkgdxdsVersion=1.4.1
-freetypeGwtVersion=1.9.10.1
-regexodusVersion=0.1.15
-squidSquadVersion=c4fb73e818
 gwtPluginVersion=1.1.29
+#digitalVersion=0.4.0
+#juniperVersion=0.3.9
+#jdkgdxdsVersion=1.4.1
+#freetypeGwtVersion=1.9.10.1
+#regexodusVersion=0.1.15
+squidSquadVersion=b7d756c4f4
+#squidSquadVersion=c4fb73e818
diff --git a/SquidSquad/DawnSquad/html/build.gradle b/SquidSquad/DawnSquad/html/build.gradle
@@ -31,27 +31,37 @@ dependencies {
 //	implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
 //	implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
 	implementation "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
-    implementation "com.github.tommyettinger:digital:$digitalVersion:sources"
-    implementation "com.github.tommyettinger:juniper:$juniperVersion:sources"
-    implementation "com.github.tommyettinger:jdkgdxds:$jdkgdxdsVersion:sources"
-    implementation "com.github.tommyettinger:funderby:0.1.1:sources"
-    implementation "com.github.tommyettinger:regexodus:0.1.15:sources"
+
+//    implementation "com.github.tommyettinger:digital:$digitalVersion:sources"
+//    implementation "com.github.tommyettinger:juniper:$juniperVersion:sources"
+//    implementation "com.github.tommyettinger:jdkgdxds:$jdkgdxdsVersion:sources"
+//    implementation "com.github.tommyettinger:funderby:0.1.1:sources"
+//    implementation "com.github.tommyettinger:regexodus:0.1.15:sources"
+
 //    implementation "com.squidpony:SquidCore:$squidSquadVersion:sources"
 //    implementation "com.squidpony:SquidGrid:$squidSquadVersion:sources"
 //    implementation "com.squidpony:SquidPlace:$squidSquadVersion:sources"
 //    implementation "com.squidpony:SquidPath:$squidSquadVersion:sources"
 //    implementation "com.squidpony:SquidText:$squidSquadVersion:sources"
 //    implementation "com.squidpony:SquidSmooth:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidCore:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidGrid:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidPlace:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidPath:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidText:$squidSquadVersion:sources"
-    implementation "com.github.yellowstonegames.squidsquad:SquidSmooth:$squidSquadVersion:sources"
+
+//    implementation "com.github.yellowstonegames.squidsquad:SquidCore:$squidSquadVersion:sources"
+//    implementation "com.github.yellowstonegames.squidsquad:SquidGrid:$squidSquadVersion:sources"
+//    implementation "com.github.yellowstonegames.squidsquad:SquidPlace:$squidSquadVersion:sources"
+//    implementation "com.github.yellowstonegames.squidsquad:SquidPath:$squidSquadVersion:sources"
+//    implementation "com.github.yellowstonegames.squidsquad:SquidText:$squidSquadVersion:sources"
+//    implementation "com.github.yellowstonegames.squidsquad:SquidSmooth:$squidSquadVersion:sources"
+
+    gwt "com.github.yellowstonegames.squidsquad:SquidCore:$squidSquadVersion:sources"
+    gwt "com.github.yellowstonegames.squidsquad:SquidGrid:$squidSquadVersion:sources"
+    gwt "com.github.yellowstonegames.squidsquad:SquidPlace:$squidSquadVersion:sources"
+    gwt "com.github.yellowstonegames.squidsquad:SquidPath:$squidSquadVersion:sources"
+    gwt "com.github.yellowstonegames.squidsquad:SquidText:$squidSquadVersion:sources"
+    gwt "com.github.yellowstonegames.squidsquad:SquidSmooth:$squidSquadVersion:sources"
 
 
-    implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion"
-    implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion:sources"
+//    implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion"
+//    implementation "com.github.intrigus.gdx-freetype-gwt:gdx-freetype-gwt:$freetypeGwtVersion:sources"
 
 	implementation project(':core')
 

diff --git a/SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/GdxDefinition.gwt.xml b/SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/GdxDefinition.gwt.xml
@@ -4,7 +4,7 @@
 	<source path="" />
 	<inherits name="com.badlogic.gdx.backends.gdx_backends_gwt" />
 
-	<inherits name="com.badlogic.gdx.graphics.g2d.freetype.freetype-gwt" />
+<!--	<inherits name="com.badlogic.gdx.graphics.g2d.freetype.freetype-gwt" />-->
 	<inherits name="com.github.yellowstonegames.squidcore" />
 	<inherits name="com.github.yellowstonegames.squidgrid" />
 	<inherits name="com.github.yellowstonegames.squidplace" />

diff --git a/SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/gwt/GwtLauncher.java b/SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/gwt/GwtLauncher.java
@@ -28,8 +28,8 @@ public ApplicationListener createApplicationListener() {
 		return new DawnSquad();
 	}
 
-	@Override
-	public void onModuleLoad() {
-		com.badlogic.gdx.graphics.g2d.freetype.gwt.FreetypeInjector.inject(super::onModuleLoad);
-	}
+//	@Override
+//	public void onModuleLoad() {
+//		com.badlogic.gdx.graphics.g2d.freetype.gwt.FreetypeInjector.inject(super::onModuleLoad);
+//	}
 }