Skip to content

Commit

Permalink
Build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Karasiq committed Feb 15, 2018
1 parent 8434560 commit 2d20d82
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 11 deletions.
23 changes: 14 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import com.github.sbtliquibase.SbtLiquibase

val commonSettings = Seq(
organization := "com.github.karasiq",
version := "1.0.0-SNAPSHOT",
Expand Down Expand Up @@ -296,9 +294,9 @@ lazy val `meta-tests` = (project in file("target") / "meta-tests")
.settings(commonSettings, name := "shadowcloud-meta-tests")
.aggregate(coreAssembly, `server-api-routes`, autowireApiJVM)

lazy val shell = (project in file("."))
.settings(commonSettings)
lazy val shell = project
.settings(
commonSettings,
name := "shadowcloud-shell",
mainClass in Compile := Some("com.karasiq.shadowcloud.test.Benchmark"),
libraryDependencies ++= Seq(
Expand All @@ -307,8 +305,15 @@ lazy val shell = (project in file("."))
initialCommands in console :=
"""import com.karasiq.shadowcloud.shell.Shell._
|init()
|test()
|""".stripMargin,
|//test()
|""".stripMargin
)
.dependsOn(coreAssembly, javafx)

lazy val shadowcloud = (project in file("."))
.settings(
commonSettings,
name := "shadowcloud-root",
liquibaseUsername := "sa",
liquibasePassword := s"${sys.props("shadowcloud.persistence.h2.password").ensuring(_.ne(null), "No password").replace(' ', '_')} sa",
liquibaseDriver := "org.h2.Driver",
Expand All @@ -318,7 +323,7 @@ lazy val shell = (project in file("."))
val compress = sys.props.getOrElse("shadowcloud.persistence.h2.compress", true)
s"jdbc:h2:file:$path;CIPHER=$cipher;COMPRESS=$compress"
},
liquibaseChangelog := file("src/main/migrations/changelog.sql")
liquibaseChangelog := sourceDirectory.value / "migrations" / "changelog.sql"
)
.dependsOn(coreAssembly, javafx)
.enablePlugins(SbtLiquibase)
.enablePlugins(com.github.sbtliquibase.SbtLiquibase)
.aggregate(coreAssembly, server, javafx)
2 changes: 1 addition & 1 deletion project/ProjectDeps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ object ProjectDeps {
)

def webzinc: Deps = {
val version = "1.0.6"
val version = "1.0.7"
Seq(
"com.github.karasiq" %% "webzinc" % version,
"com.github.karasiq" %% "webzinc-htmlunit" % version
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.karasiq.shadowcloud.shell

import java.nio.file.{Paths, Path => FSPath}
import java.nio.file.{Paths, Path FSPath}

import scala.language.{implicitConversions, postfixOps}

Expand Down
File renamed without changes.

0 comments on commit 2d20d82

Please sign in to comment.