Merge pull request #101 from slick/upgrade-scala-to-2-13-with--xsourc…

…e-3-and-add-scal

Upgrade Scala to 2.13 with -Xsource:3 and add scalafmt

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
  strategy:
  matrix:
  os: [ubuntu-latest]
- scala: [2.12.19]
+ scala: [2.13.15]
  java: [temurin@11]
  runs-on: ${{ matrix.os }}
  steps:
@@ -67,7 +67,7 @@ jobs:
  strategy:
  matrix:
  os: [ubuntu-latest]
- scala: [2.12.19]
+ scala: [2.13.15]
  java: [temurin@11]
  runs-on: ${{ matrix.os }}
  steps:
@@ -87,12 +87,12 @@ jobs:
  - name: Setup sbt
  uses: sbt/setup-sbt@v1
 
- - name: Download target directories (2.12.19)
+ - name: Download target directories (2.13.15)
  uses: actions/download-artifact@v4
  with:
- name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
+ name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}
 
- - name: Inflate target directories (2.12.19)
+ - name: Inflate target directories (2.13.15)
  run: |
  tar xf targets.tar
  rm targets.tar

.mergify.yml

@@ -9,7 +9,7 @@ pull_request_rules:
  - author=scala-steward
  - author=slick-scala-steward[bot]
  - author=renovate[bot]
- - check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@11)
+ - check-success=Build and Test (ubuntu-latest, 2.13.15, temurin@11)
  actions:
  queue:
  name: default

.scalafmt.conf

@@ -0,0 +1,3 @@
+version = 3.8.3
+runner.dialect = scala3
+align.preset = most

build.sbt

@@ -1,5 +1,7 @@
 import _root_.io.github.nafg.mergify.dsl.*
 
+ThisBuild / scalaVersion := "2.13.15"
+ThisBuild / scalacOptions += "-Xsource:3"
 
 mergifyExtraConditions := Seq(
  (Attr.Author :== "scala-steward") ||
@@ -9,8 +11,8 @@ mergifyExtraConditions := Seq(
 
 libraryDependencies ++= List(
  "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
- "ch.qos.logback" % "logback-classic" % "1.5.8" % Test,
- "org.postgresql" % "postgresql" % "42.7.4" % Test,
+ "ch.qos.logback" % "logback-classic" % "1.5.8"  % Test,
+ "org.postgresql" % "postgresql"  % "42.7.4" % Test
 )
 
 scalacOptions += "-deprecation"
@@ -23,7 +25,7 @@ run / fork := true
 
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a")
 libraryDependencies += "com.typesafe.slick" %% "slick-testkit" % "3.5.1"
-libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
+libraryDependencies += "org.scala-lang"  % "scala-reflect" % scalaVersion.value
 
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
 ThisBuild / githubWorkflowBuildPreamble +=