Skip to content

Commit

Permalink
more updates to make it work with "our" zio head
Browse files Browse the repository at this point in the history
  • Loading branch information
TimPigden committed Jan 25, 2020
1 parent c9df609 commit 457a761
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
27 changes: 6 additions & 21 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import explicitdeps.ExplicitDepsPlugin.autoImport.moduleFilterRemoveValue
import sbtcrossproject.CrossPlugin.autoImport.crossProject

name := "interop-cats"
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials.artifactory")
resolvers += "Artifactory" at "https://office.optrak.com/artifactory/libs-release/"

inThisBuild(
List(
Expand All @@ -17,6 +19,7 @@ inThisBuild(
url("http://degoes.net")
)
),
resolvers += "Artifactory" at "https://office.optrak.com/artifactory/libs-release/",
pgpPassphrase := sys.env.get("PGP_PASSWORD").map(_.toArray),
pgpPublicRing := file("/tmp/public.asc"),
pgpSecretRing := file("/tmp/secret.asc"),
Expand All @@ -30,20 +33,10 @@ ThisBuild / publishTo := sonatypePublishToBundle.value

addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
addCommandAlias("testJVM", ";interopCatsJVM/test;coreOnlyTestJVM/test")
addCommandAlias("testJS", ";interopCatsJS/test;coreOnlyTestJS/test")

lazy val root = project
.in(file("."))
.enablePlugins(ScalaJSPlugin)
.aggregate(interopCatsJVM, interopCatsJS)
.settings(
skip in publish := true,
unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library")
)

lazy val zioVersion = "1.0.0-RC17+166-0a7246c5"
lazy val interopCats = crossProject(JSPlatform, JVMPlatform)
lazy val zioVersion = "1.0.0-RC17+212-d64cda8b+20200115-1756"
lazy val interopCats = crossProject(JVMPlatform)
.in(file("interop-cats"))
.enablePlugins(BuildInfoPlugin)
.settings(stdSettings("zio-interop-cats"))
Expand All @@ -69,12 +62,8 @@ lazy val interopCats = crossProject(JSPlatform, JVMPlatform)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))

lazy val interopCatsJVM = interopCats.jvm
lazy val interopCatsJS = interopCats.js
.settings(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-RC3" % Test
)

lazy val coreOnlyTest = crossProject(JSPlatform, JVMPlatform)
lazy val coreOnlyTest = crossProject(JVMPlatform)
.in(file("core-only-test"))
.dependsOn(interopCats)
.settings(stdSettings("core-only-test"))
Expand All @@ -88,7 +77,3 @@ lazy val coreOnlyTest = crossProject(JSPlatform, JVMPlatform)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))

lazy val coreOnlyTestJVM = coreOnlyTest.jvm
lazy val coreOnlyTestJS = coreOnlyTest.js
.settings(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-RC3" % Test
)
1 change: 0 additions & 1 deletion project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ object BuildHelper {
)

private val std2xOptions = Seq(
"-Xfatal-warnings",
"-language:higherKinds",
"-language:existentials",
"-explaintypes",
Expand Down

0 comments on commit 457a761

Please sign in to comment.