Merge pull request #9 from chickensoft-games/chore/godot-4.2.1

chore: upgrade to godot 4.2.1
chickensoft-games · Feb 25, 2024 · cb1cba8 · cb1cba8
2 parents 7f19eb9 + 6be1198
commit cb1cba8
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 35 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -12,4 +12,4 @@
     "streetsidesoftware.code-spell-checker",
     "VisualStudioExptTeam.vscodeintellicode"
   ]
-}
+}
diff --git a/GameDemo.csproj b/GameDemo.csproj
@@ -27,24 +27,24 @@
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <!-- Test dependencies go here! -->
     <!-- Dependencies added here will not be included in release builds. -->
-    <PackageReference Include="Chickensoft.GoDotTest" Version="1.3.2-godot4.2.0-beta.5"/>
     <!-- Used to drive test scenes when testing visual code -->
-    <PackageReference Include="GodotTestDriver" Version="2.1.0"/>
+    <PackageReference Include="Chickensoft.GoDotTest" Version="1.4.0" />
+    <PackageReference Include="Chickensoft.GodotTestDriver" Version="3.0.0" />
     <!-- Bring your own assertion library for tests! -->
     <!-- We're using Shouldly for this example, but you can use anything. -->
-    <PackageReference Include="Shouldly" Version="4.2.1"/>
-    <PackageReference Include="Moq" Version="4.20.69"/>
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="Moq" Version="4.20.69" />
   </ItemGroup>
   <ItemGroup>
     <!-- Production dependencies go here! -->
-    <PackageReference Include="Chickensoft.SuperNodes" Version="1.6.1" PrivateAssets="all" OutputItemType="analyzer"/>
-    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.6.1"/>
-    <PackageReference Include="Chickensoft.AutoInject" Version="1.5.0" PrivateAssets="all"/>
-    <PackageReference Include="Chickensoft.PowerUps" Version="3.0.1-godot4.2.0-beta.5" PrivateAssets="all"/>
-    <PackageReference Include="Chickensoft.LogicBlocks" Version="4.2.1"/>
-    <PackageReference Include="Chickensoft.LogicBlocks.Generator" Version="4.2.1" PrivateAssets="all" OutputItemType="analyzer"/>
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.1.1" PrivateAssets="all" OutputItemType="analyzer"/>
-    <PackageReference Include="Chickensoft.GoDotCollections" Version="1.4.0"/>
-    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.1.0-godot4.2.0-beta.5"/>
+    <PackageReference Include="Chickensoft.AutoInject" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="Chickensoft.GoDotCollections" Version="1.4.0" />
+    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.1.18" />
+    <PackageReference Include="Chickensoft.LogicBlocks.Generator" Version="4.2.1" PrivateAssets="all" OutputItemType="analyzer" />
+    <PackageReference Include="Chickensoft.LogicBlocks" Version="4.2.1" />
+    <PackageReference Include="Chickensoft.PowerUps" Version="3.0.1-godot4.2.0-beta.5" PrivateAssets="all" />
+    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.6.1" />
+    <PackageReference Include="Chickensoft.SuperNodes" Version="1.6.1" PrivateAssets="all" OutputItemType="analyzer" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.1.1" PrivateAssets="all" OutputItemType="analyzer" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@
 
 The Chickensoft Game Demo — a fully tested, third-person 3D game built with Godot and C#.
 
+> [!IMPORTANT]
+> Be sure to run [`git lfs pull`][lfs] to resolve the binary files.
+
 ---
 
 <p align="center">
@@ -138,3 +141,4 @@ Since we're using [LogicBlocks], here's some of the more interesting state diagr
 [GoDotCollections]: https://github.com/chickensoft-games/GoDotCollections
 [EditorConfig]: https://github.com/chickensoft-games/EditorConfig
 [game-arch]: https://chickensoft.games/blog/game-architecture
+[lfs]: https://git-lfs.com/
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "msbuild-sdks": {
-    "Godot.NET.Sdk": "4.2.0-beta.5"
+    "Godot.NET.Sdk": "4.2.1"
   },
   "sdk": {
     "rollForward": "major",
     "version": "7.0.306"
   }
-}
+}
diff --git a/src/coin/Coin.tscn b/src/coin/Coin.tscn
diff --git a/src/player/Player.cs b/src/player/Player.cs
@@ -1,12 +1,13 @@
 namespace GameDemo;
 
-using System.Runtime.CompilerServices;
 using Chickensoft.AutoInject;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.PowerUps;
 using Godot;
 using SuperNodes.Types;
 
+using Compiler = System.Runtime.CompilerServices;
+
 public interface IPlayer :
   ICharacterBody3D, IKillable, ICoinCollector, IPushEnabled {
   public bool IsMovingHorizontally();
@@ -44,10 +45,10 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayerLogic> {
 
   #region Dependencies
 
-  [Chickensoft.AutoInject.Dependency]
+  [Dependency]
   public IGameRepo GameRepo => DependOn<IGameRepo>();
 
-  [Chickensoft.AutoInject.Dependency]
+  [Dependency]
   public IAppRepo AppRepo => DependOn<IAppRepo>();
 
   #endregion Dependencies
@@ -199,9 +200,7 @@ float rotationSpeed
     ).Scaled(scale);
   }
 
-  [MethodImpl(
-    MethodImplOptions.AggressiveInlining
-  )]
+  [Compiler.MethodImpl(Compiler.MethodImplOptions.AggressiveInlining)]
   public bool IsMovingHorizontally() => (Velocity with { Y = 0f }).Length() >
                                         Settings.StoppingSpeed;
 

diff --git a/test/src/coin/CoinTest.cs b/test/src/coin/CoinTest.cs
@@ -3,8 +3,8 @@ namespace GameDemo.Tests;
 using System.Threading.Tasks;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
 using Godot;
-using GodotTestDriver;
 using Moq;
 using Shouldly;
 

diff --git a/test/src/game/GameTest.cs b/test/src/game/GameTest.cs
@@ -3,8 +3,8 @@ namespace GameDemo.Tests;
 using System.Threading.Tasks;
 using Chickensoft.AutoInject;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
 using Godot;
-using GodotTestDriver;
 using Moq;
 using Shouldly;
 

diff --git a/test/src/in_game_audio/DimmableAudioStreamPlayerTest.cs b/test/src/in_game_audio/DimmableAudioStreamPlayerTest.cs
@@ -2,8 +2,8 @@ namespace GameDemo.Tests;
 
 using System.Threading.Tasks;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
 using Godot;
-using GodotTestDriver;
 using Shouldly;
 
 public class DimmableAudioStreamPlayerTest : TestClass {

diff --git a/test/src/player/PlayerModelTest.cs b/test/src/player/PlayerModelTest.cs
@@ -3,9 +3,9 @@ namespace GameDemo.Tests;
 using System.Threading.Tasks;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
+using Chickensoft.GodotTestDriver.Util;
 using Godot;
-using GodotTestDriver;
-using GodotTestDriver.Util;
 using Moq;
 using Shouldly;
 

diff --git a/test/src/player/PlayerTest.cs b/test/src/player/PlayerTest.cs
@@ -3,8 +3,8 @@ namespace GameDemo.Tests;
 using System.Threading.Tasks;
 using Chickensoft.AutoInject;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
 using Godot;
-using GodotTestDriver;
 using Moq;
 using Shouldly;
 

diff --git a/test/src/player_camera/PlayerCameraTest.cs b/test/src/player_camera/PlayerCameraTest.cs
@@ -3,8 +3,8 @@ namespace GameDemo.Tests;
 using System.Threading.Tasks;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.GoDotTest;
+using Chickensoft.GodotTestDriver;
 using Godot;
-using GodotTestDriver;
 using Moq;
 using Shouldly;