Skip to content

Commit

Permalink
generalize build name
Browse files Browse the repository at this point in the history
  • Loading branch information
rmgk committed Feb 26, 2024
1 parent a561c6c commit 2e1681a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import RescalaDependencies.*
import LocalDependencies.*
import Settings.*

lazy val rescalaProject = project.in(file(".")).settings(noPublish).aggregate(
Expand Down Expand Up @@ -49,8 +49,8 @@ lazy val rescala = crossProject(JVMPlatform, JSPlatform, NativePlatform).in(file
publishSonatype,
resolverJitpack,
Dependencies.sourcecode,
RescalaDependencies.scalatest,
RescalaDependencies.scalatestpluscheck,
LocalDependencies.scalatest,
LocalDependencies.scalatestpluscheck,
)
.jsSettings(
Dependencies.scalajsDom,
Expand All @@ -60,7 +60,7 @@ lazy val rescala = crossProject(JVMPlatform, JSPlatform, NativePlatform).in(file
)

lazy val reswing = project.in(file("Modules/Swing"))
.settings(scala3defaults, noPublish, RescalaDependencies.scalaSwing)
.settings(scala3defaults, noPublish, LocalDependencies.scalaSwing)
.dependsOn(rescala.jvm)

lazy val rescalafx = project.in(file("Modules/Javafx"))
Expand Down Expand Up @@ -94,13 +94,13 @@ lazy val aead = crossProject(JSPlatform, JVMPlatform).in(file("Modules/Aead"))
.settings(
scala3defaults,
noPublish,
RescalaDependencies.scalatest,
RescalaDependencies.scalatestpluscheck,
LocalDependencies.scalatest,
LocalDependencies.scalatestpluscheck,
Dependencies.munit,
Dependencies.munitCheck,
)
.jvmSettings(
RescalaDependencies.tink
LocalDependencies.tink
)
.jsConfigure(_.enablePlugins(ScalaJSBundlerPlugin))
.jsSettings(
Expand Down Expand Up @@ -181,8 +181,8 @@ lazy val encryptedTodo = project.in(file("Modules/Example EncryptedTodoFx"))
scalaFxDependencies,
fork := true,
Dependencies.jsoniterScala,
RescalaDependencies.jetty11,
RescalaDependencies.tink,
LocalDependencies.jetty11,
LocalDependencies.tink,
libraryDependencies += "org.conscrypt" % "conscrypt-openjdk-uber" % "2.5.2",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport.*
import sbt.*
import sbt.Keys.*

object RescalaDependencies {
object LocalDependencies {

val scalatest = libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.18" % Test
val scalatest = libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.18" % Test
val scalatestpluscheck = libraryDependencies += "org.scalatestplus" %%% "scalacheck-1-17" % "3.2.18.0" % "test"
val circe = libraryDependencies ++= Seq("core", "generic", "parser").map(n => "io.circe" %%% s"circe-$n" % "0.14.3")

Expand Down

0 comments on commit 2e1681a

Please sign in to comment.