Skip to content

Commit

Permalink
Upgrade Scala to 2.13 with -Xsource:3 and add scalafmt
Browse files Browse the repository at this point in the history
  • Loading branch information
nafg committed Sep 29, 2024
1 parent 0b0e416 commit 59e17f7
Show file tree
Hide file tree
Showing 6 changed files with 402 additions and 300 deletions.
3 changes: 3 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version = 3.8.3
runner.dialect = scala3
align.preset = most
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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") ||
Expand All @@ -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"
Expand All @@ -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 +=
Expand Down
267 changes: 0 additions & 267 deletions src/main/scala/MyPostgresProfile.scala

This file was deleted.

Loading

0 comments on commit 59e17f7

Please sign in to comment.