From 443ca879c5c53905d06c50c3ec4e973aa468f00a Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Tue, 10 Dec 2024 17:07:53 +0100
Subject: [PATCH 1/2] Update Scala version to 3.6.2

---
 src/main/g8/build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index 9179ecb..985566c 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -1,4 +1,4 @@
-val scala3Version = "3.5.2"
+val scala3Version = "3.6.2"
 
 lazy val root = project
   .in(file("."))

From cc12810da8c741cfb3b8bbf34432c5ca19e1e965 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wojciech.mazur95@gmail.com>
Date: Tue, 10 Dec 2024 17:17:22 +0100
Subject: [PATCH 2/2] Fix CLA check

---
 .github/workflows/cla.yml    |  7 +++----
 project/scripts/check-cla.sh | 17 -----------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100755 project/scripts/check-cla.sh

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 53800df..93eac89 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -4,7 +4,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: ./project/scripts/check-cla.sh
-      env:
-        AUTHOR: ${{ github.event.pull_request.user.login }}
+    - uses: scala/cla-verification-action@main
+      with:
+        author: ${{ github.event.pull_request.user.login }}
diff --git a/project/scripts/check-cla.sh b/project/scripts/check-cla.sh
deleted file mode 100755
index 8538a27..0000000
--- a/project/scripts/check-cla.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-AUTHOR=$GITHUB_ACTOR
-echo "Pull request submitted by $AUTHOR";
-signed=$(curl -s https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR | jq -r ".signed");
-if [ "$signed" = "true" ] ; then
-  echo "CLA check for $AUTHOR successful";
-else
-  echo "CLA check for $AUTHOR failed";
-  echo "Please sign the Scala CLA to contribute to the Scala compiler.";
-  echo "Go to https://www.lightbend.com/contribute/cla/scala and then";
-  echo "comment on the pull request to ask for a new check.";
-  echo "";
-  echo "Check if CLA is signed: https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR";
-  exit 1;
-fi;