From 1121552335dba21cd58dcdb5ca55b3757f9b36b0 Mon Sep 17 00:00:00 2001
From: Georgi Krastev <joro.kr.21@gmail.com>
Date: Wed, 13 Apr 2022 09:51:05 +0200
Subject: [PATCH 1/2] Scala 3.1.2

---
 .github/workflows/ci.yml | 16 ++++++++--------
 build.sbt                |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1dda7a4..1f894190 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.15, 2.13.8, 3.1.2-RC3]
+        scala: [2.12.15, 2.13.8, 3.1.2]
         java: [temurin@8]
         project: [rootJS, rootJVM]
     runs-on: ${{ matrix.os }}
@@ -100,7 +100,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.1.2-RC3]
+        scala: [3.1.2]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -168,22 +168,22 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.1.2-RC3, rootJS)
+      - name: Download target directories (3.1.2, rootJS)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-RC3-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS
 
-      - name: Inflate target directories (3.1.2-RC3, rootJS)
+      - name: Inflate target directories (3.1.2, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.1.2-RC3, rootJVM)
+      - name: Download target directories (3.1.2, rootJVM)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-RC3-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM
 
-      - name: Inflate target directories (3.1.2-RC3, rootJVM)
+      - name: Inflate target directories (3.1.2, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/build.sbt b/build.sbt
index 23853e77..65c99f71 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import sbt._
 
 val scala212 = "2.12.15"
 val scala213 = "2.13.8"
-val scala3 = "3.1.2-RC3"
+val scala3 = "3.1.2"
 
 ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
 ThisBuild / scalaVersion := scala3

From 86c8735316a329658cfad4fdbcd9abf8d0dffc68 Mon Sep 17 00:00:00 2001
From: Georgi Krastev <joro.kr.21@gmail.com>
Date: Wed, 13 Apr 2022 19:35:23 +0200
Subject: [PATCH 2/2] Update sbt to 1.7.0-M1 and set scalaOutputVersion

---
 build.sbt                | 1 +
 project/build.properties | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 65c99f71..4807a373 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,6 +6,7 @@ val scala3 = "3.1.2"
 
 ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
 ThisBuild / scalaVersion := scala3
+ThisBuild / scalaOutputVersion := (if (tlIsScala3.value) "3.0.2" else scalaVersion.value)
 ThisBuild / tlBaseVersion := "3.0"
 ThisBuild / organization := "org.typelevel"
 
diff --git a/project/build.properties b/project/build.properties
index c8fcab54..7bf03fa6 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.0-M1