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.

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

Remove elaboration from SELECT queries #56

Merged
merged 1 commit into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,12 @@ lazy val `quill-sql` =
"com.typesafe.scala-logging" % "scala-logging_2.13"
),
libraryDependencies ++= Seq(
// Needs to be in-sync with both quill-engine and scalafmt-core or ClassNotFound
// errors will happen. Even if the pprint classes are actually there
("com.lihaoyi" %% "pprint" % "0.6.6"),
("io.getquill" %% "quill-core-portable" % "3.12.0").cross(CrossVersion.for3Use2_13),
("io.getquill" %% "quill-sql-portable" % "3.12.0").cross(CrossVersion.for3Use2_13),
"io.getquill" %% "quill-engine" % "3.14.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
("org.scalameta" %% "scalafmt-core" % "3.1.0")
("org.scalameta" %% "scalafmt-core" % "3.3.3")
.excludeAll(
ExclusionRule(organization = "com.lihaoyi", name = "sourcecode_2.13"),
ExclusionRule(organization = "com.lihaoyi", name = "fansi_2.13"),
Expand Down Expand Up @@ -178,8 +179,7 @@ lazy val `quill-jasync` =
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-common" % "1.1.4",
("org.scala-lang.modules" %% "scala-java8-compat" % "1.0.1")
"com.github.jasync-sql" % "jasync-common" % "1.1.4"
)
)
.dependsOn(`quill-sql` % "compile->compile;test->test")
Expand Down Expand Up @@ -258,10 +258,9 @@ lazy val `quill-cassandra` =
.settings(commonSettings: _*)
.settings(releaseSettings: _*)
.settings(
Test / fork := true,
Test / fork := false,
libraryDependencies ++= Seq(
"com.datastax.oss" % "java-driver-core" % "4.13.0",
("org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1").withDottyCompat(scalaVersion.value)
"com.datastax.oss" % "java-driver-core" % "4.13.0"
)
)
.dependsOn(`quill-sql` % "compile->compile;test->test")
Expand Down Expand Up @@ -306,6 +305,14 @@ lazy val jdbcTestingSettings = jdbcTestingLibraries ++ Seq(
)

lazy val basicSettings = Seq(
// ,
// ("org.scala-lang.modules" %% "scala-java8-compat" % "1.0.1")
libraryDependencies ++= Seq(
("org.scala-lang.modules" %% "scala-java8-compat" % "1.0.1")
),
excludeDependencies ++= Seq(
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13")
),
scalaVersion := {
if (isCommunityBuild) dottyLatestNightlyBuild().get else "3.0.2"
},
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ services:
- POSTGRES_HOST_AUTH_METHOD=trust

mysql:
image: mysql:5.7
image: mysql/mysql-server:8.0.23 # use this because it supports ARM64 architecture for M1 Mac
command: --default-authentication-plugin=mysql_native_password
ports:
- "13306:3306"
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_ROOT_HOST=%

cassandra:
build:
Expand Down
14 changes: 2 additions & 12 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,14 @@ resolvers += Classpaths.sbtPluginReleases

resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"

addDependencyTreePlugin

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

// addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")

// addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")

// addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")

// addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")

// addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")

// addSbtPlugin("com.etsy" % "sbt-compile-quick-plugin" % "1.4.0")

This file was deleted.

This file was deleted.

Loading