Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala 2.12 to 2.12.17 && Drop quill-finagle-mysql and quill-finagle-postgres modules #2756

Merged
merged 3 commits into from
Jun 1, 2023
Merged

Update Scala 2.12 to 2.12.17 && Drop quill-finagle-mysql and quill-finagle-postgres modules #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15db74a
Update Scala 2.12 to 2.12.17
guizmaii Jun 1, 2023
fbff735
clean
guizmaii Jun 1, 2023
d53df22
Drop `quill-finagle-mysql` and `quill-finagle-postgres` module
guizmaii Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ lazy val jasyncModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
)

lazy val asyncModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
`quill-finagle-mysql`,
`quill-finagle-postgres`,
`quill-ndbc`,
`quill-ndbc-postgres`,
`quill-ndbc-monix`
Expand All @@ -106,7 +104,6 @@ lazy val allModules =

lazy val scala213Modules =
baseModules ++ jsModules ++ dbModules ++ codegenModules ++ Seq[sbt.ClasspathDep[sbt.ProjectReference]](
`quill-finagle-mysql`,
`quill-cassandra`,
`quill-cassandra-alpakka`,
`quill-cassandra-monix`,
Expand Down Expand Up @@ -543,34 +540,12 @@ lazy val `quill-spark` =
.settings(commonNoLogSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq("org.apache.spark" %% "spark-sql" % "3.2.1"),
libraryDependencies ++= Seq("org.apache.spark" %% "spark-sql" % "3.4.0"),
excludeDependencies ++= Seq("ch.qos.logback" % "logback-classic")
)
.dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-finagle-mysql` =
(project in file("quill-finagle-mysql"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq("com.twitter" %% "finagle-mysql" % "21.9.0")
)
.dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-finagle-postgres` =
(project in file("quill-finagle-postgres"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"io.github.finagle" %% "finagle-postgres" % "0.12.0"
)
)
.dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync` =
(project in file("quill-jasync"))
.settings(commonSettings: _*)
Expand Down Expand Up @@ -668,8 +643,11 @@ lazy val `quill-cassandra` =
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.datastax.oss" % "java-driver-core" % "4.14.1",
"org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
"com.datastax.oss" % "java-driver-core" % "4.15.0",
(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0"
case _ => "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
})
Comment on lines +647 to +650
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Akka uses 0.8.0 in its 2.12 version and 1.0.x in its 2.13 version.
These versions are not binary compatible

)
)
.dependsOn(`quill-core-jvm` % "compile->compile;test->test")
Expand Down Expand Up @@ -705,8 +683,8 @@ lazy val `quill-cassandra-alpakka` =
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.lightbend.akka" %% "akka-stream-alpakka-cassandra" % "3.0.4",
"com.typesafe.akka" %% "akka-testkit" % "2.6.14" % Test
"com.lightbend.akka" %% "akka-stream-alpakka-cassandra" % "6.0.1",
"com.typesafe.akka" %% "akka-testkit" % "2.8.1" % Test
)
)
.dependsOn(`quill-cassandra` % "compile->compile;test->test")
Expand Down Expand Up @@ -822,7 +800,7 @@ def excludePaths(paths: Seq[String]) = {
})
}

val scala_v_12 = "2.12.16"
val scala_v_12 = "2.12.17"
val scala_v_13 = "2.13.10"
val scala_v_30 = "3.2.2"

Expand All @@ -839,7 +817,7 @@ lazy val basicSettings = excludeFilterSettings ++ Seq(
crossScalaVersions := Seq(scala_v_12, scala_v_13, scala_v_30),
libraryDependencies ++= Seq(
"com.lihaoyi" %% "pprint" % "0.6.6",
"org.scalatest" %%% "scalatest" % "3.2.10" % Test,
"org.scalatest" %%% "scalatest" % "3.2.16" % Test,
"com.google.code.findbugs" % "jsr305" % "3.0.2" % Provided // just to avoid warnings during compilation
) ++ {
if (debugMacro && isScala2)
Expand Down
2 changes: 1 addition & 1 deletion build/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ then
echo "No Artifact Specified"
fi

SBT_2_12="sbt ++2.12.16 -Dquill.macro.log=false -Dquill.scala.version=2.12.16"
SBT_2_12="sbt ++2.12.17 -Dquill.macro.log=false -Dquill.scala.version=2.12.17"
SBT_2_13="sbt ++2.13.10 -Dquill.macro.log=false -Dquill.scala.version=2.13.10"
SBT_3_2="sbt ++3.2.2 -Dquill.macro.log=false -Dquill.scala.version=3.2.2"

Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ id: changelog
title: "Quill Changelog"
---

# 4.7.0

- [Update Scala 2.12 && Drop `quill-finagle-mysql` and `quill-finagle-postgres` modules](https://github.com/zio/zio-quill/pull/2756)

# 4.6.1

- [Remove support of Scala 2.11 && Update ZIO to 2.0.12](https://github.com/zio/zio-quill/pull/2722)
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
addDependencyTreePlugin

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("com.etsy" % "sbt-compile-quick-plugin" % "1.4.0")
Expand Down
251 changes: 0 additions & 251 deletions quill-finagle-mysql/src/main/scala/io/getquill/FinagleMysqlContext.scala
View file
Open in desktop

This file was deleted.

Loading