Skip to content

Commit ad99335

Browse files
committed
feat: add support for scala3
1 parent bb9530b commit ad99335

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

.github/workflows/bump-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
--grep='^revert:' \
3636
--grep='^chore:' | awk 'END{print NR}')
3737
echo "steps.changes.outputs.count = $COUNT"
38-
FORCE=${{ github.event.inputs.force }}
38+
FORCE=${{ inputs.force }}
3939
if [[ "$FORCE" = "1" ]]; then
4040
echo "::set-output name=count::1"
4141
else

.scalafix.conf

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
rules = [
22
//Semantic Rules
33
//ExplicitResultTypes, // Deactivated as scalafix on Scala 3 fails otherwise
4-
RemoveUnused,
54
NoAutoTupling,
65
//Syntactic Rules
76
DisableSyntax,
8-
ProcedureSyntax,
7+
//ProcedureSyntax,
98
LeakingImplicitClassVal,
109
NoValInForComprehension
1110
]

build.sbt

+8-10
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def crossScalacOptions(scalaVersion: String): Seq[String] = CrossVersion.partial
1010
Seq(
1111
"-Ydelambdafy:method",
1212
"-target:jvm-1.8",
13-
"-Yrangepos",
14-
"-Ywarn-unused"
13+
"-Yrangepos"
14+
// "-Ywarn-unused"
1515
)
1616
}
1717

@@ -27,8 +27,8 @@ lazy val baseSettings = Seq(
2727
url = url("https://blog.j5ik2o.me")
2828
)
2929
),
30-
scalaVersion := Versions.scala213Version,
31-
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version),
30+
scalaVersion := Versions.scala3Version,
31+
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version, Versions.scala3Version),
3232
scalacOptions ++= (Seq(
3333
"-unchecked",
3434
"-feature",
@@ -37,11 +37,9 @@ lazy val baseSettings = Seq(
3737
"UTF-8",
3838
"-language:_"
3939
) ++ crossScalacOptions(scalaVersion.value)),
40-
resolvers ++= Seq(
41-
Resolver.sonatypeRepo("snapshots"),
42-
Resolver.sonatypeRepo("releases"),
43-
"Seasar Repository" at "https://maven.seasar.org/maven2/"
44-
),
40+
resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
41+
resolvers ++= Resolver.sonatypeOssRepos("releases"),
42+
resolvers += "Seasar Repository" at "https://maven.seasar.org/maven2/",
4543
libraryDependencies ++= Seq(
4644
scalatest.scalatest % Test
4745
),
@@ -279,4 +277,4 @@ val `docker-controller-scala-root` = (project in file("."))
279277

280278
// --- Custom commands
281279
addCommandAlias("lint", ";scalafmtCheck;test:scalafmtCheck;scalafmtSbtCheck;scalafixAll --check")
282-
addCommandAlias("fmt", ";scalafmtAll;scalafmtSbt;scalafix RemoveUnused")
280+
addCommandAlias("fmt", ";scalafmtAll;scalafmtSbt")

project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Dependencies {
66
val scala212Version = "2.12.17"
77
val scala213Version = "2.13.11"
88
val scala3Version = "3.1.3"
9-
val scalaTestVersion = "3.2.12"
9+
val scalaTestVersion = "3.2.16"
1010
val logbackVersion = "1.2.12"
1111
val scalaCollectionCompatVersion = "2.11.0"
1212
val dockerJavaVersion = "3.3.2"

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.5.5
1+
sbt.version = 1.7.0

0 commit comments

Comments
 (0)