Skip to content

Commit

Permalink
Merge branch 'main' into localrunners/pollux-update
Browse files Browse the repository at this point in the history
  • Loading branch information
abalias committed Mar 28, 2023
2 parents af797ff + f7ecb6b commit 1fbf87d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 39 deletions.
7 changes: 7 additions & 0 deletions castor/lib/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [castor-v0.8.3](https://github.com/input-output-hk/atala-prism-building-blocks/compare/castor-v0.8.2...castor-v0.8.3) (2023-03-28)


### Bug Fixes

* update shared module for castor ([#484](https://github.com/input-output-hk/atala-prism-building-blocks/issues/484)) ([2202a22](https://github.com/input-output-hk/atala-prism-building-blocks/commit/2202a220fdcd404bb3fe280b3b76923fbf499b8c))

# [castor-v0.8.2](https://github.com/input-output-hk/atala-prism-building-blocks/compare/castor-v0.8.1...castor-v0.8.2) (2023-03-23)


Expand Down
38 changes: 11 additions & 27 deletions castor/lib/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Dependencies._
import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._

inThisBuild(
Seq(
Expand All @@ -18,34 +19,9 @@ inThisBuild(

coverageDataDir := target.value / "coverage"

SbtUtils.disablePlugins(publishConfigure) // SEE also SbtUtils.scala
lazy val publishConfigure: Project => Project = sys.env
.get("PUBLISH_PACKAGES") match {
case None => _.disablePlugins(GitHubPackagesPlugin)
case Some(_) => (p: Project) => p
}

sys.env
.get("PUBLISH_PACKAGES") // SEE also plugin.sbt
.map { _ =>
println("### Configure release process ###")
import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
inquireVersions,
runClean,
runTest,
setReleaseVersion,
publishArtifacts,
setNextVersion
)
}
.toSeq

// Project definitions
lazy val root = project
.in(file("."))
.configure(publishConfigure)
.settings(
name := "castor-root",
)
Expand All @@ -54,17 +30,25 @@ lazy val root = project

lazy val core = project
.in(file("core"))
.configure(publishConfigure)
.settings(
name := "castor-core",
libraryDependencies ++= coreDependencies
)

lazy val `sql-doobie` = project
.in(file("sql-doobie"))
.configure(publishConfigure)
.settings(
name := "castor-sql-doobie",
libraryDependencies ++= sqlDoobieDependencies
)
.dependsOn(core)

releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
inquireVersions,
runClean,
runTest,
setReleaseVersion,
publishArtifacts,
setNextVersion
)
2 changes: 1 addition & 1 deletion castor/lib/project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object Dependencies {
val zioCatsInterop = "3.3.0"
val prismNodeClient = "0.3.0"
val prismSdk = "v1.4.1" // scala-steward:off
val shared = "0.2.0"
val shared = "0.3.0"
val flyway = "9.8.3"
val scalaUri = "4.0.3"
}
Expand Down
10 changes: 0 additions & 10 deletions castor/lib/project/SbtUtils.scala

This file was deleted.

2 changes: 1 addition & 1 deletion castor/lib/version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.8.2-SNAPSHOT"
ThisBuild / version := "0.8.3-SNAPSHOT"

0 comments on commit 1fbf87d

Please sign in to comment.