Skip to content

Commit 649828f

Browse files
tpolecattpolecat
authored
Merge pull request #462 from tpolecat/ce3-scala-3
scala-3
2 parents 4ef7d2c + 82900cf commit 649828f

File tree

4 files changed

+28
-40
lines changed

4 files changed

+28
-40
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Skunk
22

3+
[![Discord](https://img.shields.io/discord/632277896739946517.svg?label=&logo=discord&logoColor=ffffff&color=404244&labelColor=6A7EC2)](https://discord.gg/CSh8u9yPMe)
34
[![Join the chat at https://gitter.im/skunk-pg/Lobby](https://badges.gitter.im/skunk-pg/Lobby.svg)](https://gitter.im/skunk-pg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
45
[![codecov](https://codecov.io/gh/tpolecat/skunk/branch/master/graph/badge.svg)](https://codecov.io/gh/tpolecat/skunk)
56
[![Maven Central](https://img.shields.io/maven-central/v/org.tpolecat/skunk-core_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/org.tpolecat/skunk-core_2.12)

‎build.sbt‎

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11

22

33
// Our Scala versions.
4-
lazy val `scala-2.12` = "2.12.13"
5-
lazy val `scala-2.13` = "2.13.5"
6-
lazy val `scala-3.0-prev` = "3.0.0-RC2"
7-
lazy val `scala-3.0-curr` = "3.0.0-RC3"
4+
lazy val `scala-2.12` = "2.12.13"
5+
lazy val `scala-2.13` = "2.13.5"
6+
lazy val `scala-3.0` = "3.0.0"
87

98
// This is used in a couple places
10-
lazy val fs2Version = "3.0.2"
11-
lazy val natchezVersion = "0.1.2"
12-
9+
lazy val fs2Version = "3.0.3"
10+
lazy val natchezVersion = "0.1.4"
1311

1412
// We do `evictionCheck` in CI
1513
inThisBuild(Seq(
@@ -45,7 +43,7 @@ lazy val commonSettings = Seq(
4543

4644
// Compilation
4745
scalaVersion := `scala-2.13`,
48-
crossScalaVersions := Seq(`scala-2.12`, `scala-2.13`, `scala-3.0-prev`, `scala-3.0-curr`),
46+
crossScalaVersions := Seq(`scala-2.12`, `scala-2.13`, `scala-3.0`),
4947
scalacOptions -= "-language:experimental.macros", // doesn't work cross-version
5048
Compile / doc / scalacOptions --= Seq("-Xfatal-warnings"),
5149
Compile / doc / scalacOptions ++= Seq(
@@ -67,22 +65,13 @@ lazy val commonSettings = Seq(
6765
Compile / unmanagedSourceDirectories ++= {
6866
val sourceDir = (Compile / sourceDirectory).value
6967
CrossVersion.partialVersion(scalaVersion.value) match {
70-
case Some((3, _)) => Seq(sourceDir / "scala-3", sourceDir / "scala-2.13+")
71-
case Some((2, 12)) => Seq(sourceDir / "scala-2")
72-
case Some((2, _)) => Seq(sourceDir / "scala-2", sourceDir / "scala-2.13+")
68+
case Some((3, _)) => Seq(sourceDir / "scala-2.13+")
69+
case Some((2, 12)) => Seq()
70+
case Some((2, _)) => Seq(sourceDir / "scala-2.13+")
7371
case _ => Seq()
7472
}
7573
},
7674

77-
// Also for test
78-
Test / unmanagedSourceDirectories ++= {
79-
val sourceDir = (Test / sourceDirectory).value
80-
CrossVersion.partialVersion(scalaVersion.value) match {
81-
case Some((3, _)) => Seq(sourceDir / "scala-3")
82-
case Some((2, _)) => Seq(sourceDir / "scala-2")
83-
case _ => Seq()
84-
}
85-
},
8675

8776
// dottydoc really doesn't work at all right now
8877
Compile / doc / sources := {
@@ -112,16 +101,16 @@ lazy val core = project
112101
description := "Tagless, non-blocking data access library for Postgres.",
113102
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
114103
libraryDependencies ++= Seq(
115-
"org.typelevel" %% "cats-core" % "2.6.0",
116-
"org.typelevel" %% "cats-effect" % "3.1.0",
104+
"org.typelevel" %% "cats-core" % "2.6.1",
105+
"org.typelevel" %% "cats-effect" % "3.1.1",
117106
"co.fs2" %% "fs2-core" % fs2Version,
118107
"co.fs2" %% "fs2-io" % fs2Version,
119-
"org.scodec" %% "scodec-core" % (if (scalaVersion.value.startsWith("3.")) "2.0.0-RC3" else "1.11.7"),
120-
"org.scodec" %% "scodec-cats" % "1.1.0-RC3",
108+
"org.scodec" %% "scodec-core" % (if (scalaVersion.value.startsWith("3.")) "2.0.0" else "1.11.7"),
109+
"org.scodec" %% "scodec-cats" % "1.1.0",
121110
"org.tpolecat" %% "natchez-core" % natchezVersion,
122-
"org.tpolecat" %% "sourcepos" % "0.1.3",
111+
"org.tpolecat" %% "sourcepos" % "1.0.0",
123112
"com.ongres.scram" % "client" % "2.1",
124-
"org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3",
113+
"org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4",
125114
) ++ Seq(
126115
"com.beachape" %% "enumeratum" % "1.6.1",
127116
).filterNot(_ => scalaVersion.value.startsWith("3."))
@@ -134,7 +123,7 @@ lazy val refined = project
134123
.settings(commonSettings)
135124
.settings(
136125
libraryDependencies ++= Seq(
137-
"eu.timepit" %% "refined" % "0.9.24",
126+
"eu.timepit" %% "refined" % "0.9.25",
138127
)
139128
)
140129

@@ -148,9 +137,8 @@ lazy val circe = project
148137
libraryDependencies ++= {
149138
lazy val circeVersion: String =
150139
scalaVersion.value match {
151-
case `scala-3.0-curr` => "0.14.0-M6"
152-
case `scala-3.0-prev` => "0.14.0-M5"
153-
case _ => "0.13.0"
140+
case `scala-3.0` => "0.14.0-M7"
141+
case _ => "0.13.0"
154142
}
155143
Seq(
156144
"io.circe" %% "circe-core" % circeVersion,
@@ -168,11 +156,11 @@ lazy val tests = project
168156
publish / skip := true,
169157
scalacOptions -= "-Xfatal-warnings",
170158
libraryDependencies ++= Seq(
171-
"org.typelevel" %% "scalacheck-effect-munit" % "1.0.1",
172-
"org.typelevel" %% "munit-cats-effect-3" % "1.0.2",
173-
"org.typelevel" %% "cats-free" % "2.6.0",
174-
"org.typelevel" %% "cats-laws" % "2.6.0",
175-
"org.typelevel" %% "discipline-munit" % "1.0.8",
159+
"org.typelevel" %% "scalacheck-effect-munit" % "1.0.2",
160+
"org.typelevel" %% "munit-cats-effect-3" % "1.0.3",
161+
"org.typelevel" %% "cats-free" % "2.6.1",
162+
"org.typelevel" %% "cats-laws" % "2.6.1",
163+
"org.typelevel" %% "discipline-munit" % "1.0.9",
176164
) ++ Seq(
177165
"io.chrisdavenport" %% "cats-time" % "0.3.4",
178166
).filterNot(_ => scalaVersion.value.startsWith("3.")),

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.1
1+
sbt.version=1.5.2

‎project/plugins.sbt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
33
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
44
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
55
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
6-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.2")
6+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
77
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")
8-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.19")
9-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
10-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")
8+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20")
9+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.0")
1110
addSbtPlugin("ch.epfl.scala" % "sbt-eviction-rules" % "1.0.0-RC1")

0 commit comments

Comments
 (0)