Merge branch 'master' into coroutines_course_empty

# Conflicts: # .github/workflows/build_and_test.yml
LukasLechnerDev · Nov 8, 2024 · 172d186 · 172d186
2 parents fd7602e + 356ad72
commit 172d186
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -10,11 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set Up JDK
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          java-version: 1.17
 
       - name: Run Tests
         run: ./gradlew test

diff --git a/.idea/misc.xml b/.idea/misc.xml