User: rednesto
Date: 05 Jan 23 21:37
Revision: 55d544ea14e0ff080c7850ee571793d14d942e3c
Summary:
Merge branch '2022.2' into 2022.3

# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test.yml


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8218&personal=false

Index: .github/workflows/publish.yml
===================================================================
--- .github/workflows/publish.yml	(revision 1b6e433603ee24b53d43cdb3780fb0bebfc427db)
+++ .github/workflows/publish.yml	(revision 55d544ea14e0ff080c7850ee571793d14d942e3c)
@@ -9,11 +9,12 @@
     name: Publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
Index: .github/workflows/test.yml
===================================================================
--- .github/workflows/test.yml	(revision 1b6e433603ee24b53d43cdb3780fb0bebfc427db)
+++ .github/workflows/test.yml	(revision 55d544ea14e0ff080c7850ee571793d14d942e3c)
@@ -16,11 +16,12 @@
           - 'windows-latest'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches