From a4bc4149a8f6ebca31955fe60edfcfbcc1346fc3 Mon Sep 17 00:00:00 2001
From: Joni Savolainen <joni@savolainen.io>
Date: Sun, 28 Jan 2024 10:38:42 +0200
Subject: [PATCH] chore(project): upgrade to Unity 2021.3.34f1 (#5)

* Upgrade GitHub Actions to latest versions
* chore(project): upgrade to Unity 2021.3.34f1
---
 .github/workflows/ci.yml                           | 14 ++++++++------
 .../Core/GitProcessTests.cs                        |  2 +-
 Packages/manifest.json                             |  7 +++----
 Packages/packages-lock.json                        | 13 +++----------
 ProjectSettings/ProjectVersion.txt                 |  4 ++--
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b5c920..d4723ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,15 +17,15 @@ jobs:
       matrix:
         unityVersion:
           - 2021.3.3f1
-          - 2021.3.31f1
-          - 2022.3.10f1
-          - 2023.1.16f1
+          - 2021.3.34f1
+          - 2022.3.18f1
+          - 2023.2.7f1
         targetPlatform:
           - StandaloneLinux64
           - StandaloneWindows64
     
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -38,10 +38,12 @@ jobs:
             Library-${{ matrix.targetPlatform }}-
             Library-
 
-      - uses: game-ci/unity-test-runner@v3
+      - uses: game-ci/unity-test-runner@v4
         id: testRunner
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           testMode: EditMode
           unityVersion: ${{ matrix.unityVersion }}
@@ -69,7 +71,7 @@ jobs:
           git add -A
           git commit -m "chore(ci): switch to different unity version" || echo skipping commit
 
-      - uses: game-ci/unity-builder@v3
+      - uses: game-ci/unity-builder@v4
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
diff --git a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
index 9136cd8..1f06e87 100644
--- a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
+++ b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
@@ -66,7 +66,7 @@ public IEnumerator It_Times_Out_After_Given_Milliseconds()
                 // Ping is used instead, which is pretty hacky.
                 fileName = "ping";
                 arguments = "-n 5 127.0.0.1";
-                expectedLines = 3;
+                expectedLines = 2;
             }
             else
             {
diff --git a/Packages/manifest.json b/Packages/manifest.json
index eb7683c..c4a5508 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,13 +1,12 @@
 {
   "dependencies": {
     "com.marijnzwemmer.unity-toolbar-extender": "1.4.2",
-    "com.unity.collab-proxy": "2.1.0",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.27",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.testtools.codecoverage": "1.2.4",
-    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.testtools.codecoverage": "1.2.5",
+    "com.unity.textmeshpro": "3.0.7",
     "com.unity.ugui": "1.0.0",
     "io.savolainen.uicomponents": "1.0.0-beta.8",
     "com.unity.modules.ai": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 16fff3d..4e83922 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -7,13 +7,6 @@
       "dependencies": {},
       "url": "https://package.openupm.com"
     },
-    "com.unity.collab-proxy": {
-      "version": "2.1.0",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -22,7 +15,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.27",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -65,7 +58,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -75,7 +68,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.6",
+      "version": "3.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 9706d86..03cda39 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.31f1
-m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f)
+m_EditorVersion: 2021.3.34f1
+m_EditorVersionWithRevision: 2021.3.34f1 (25266724e7bd)