From 4574e2c535a25ec70dcb2edca5e2ed0069e9b6b8 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 30 Jun 2019 13:58:19 +0100 Subject: [PATCH] Include assembly jar in release (#96) * [sbt] set name for assembly jar * [travis] run assembly prior to release * [sbt] disable publishing non-cli or thorp-lib modules * [travis] alternate format for multiple commands in script --- .travis.yml | 4 +++- build.sbt | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f19613c..cbba73b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,9 @@ jobs: - stage: test script: sbt ++$TRAVIS_SCALA_VERSION test - stage: release - script: sbt ++$TRAVIS_SCALA_VERSION ci-release + script: + - sbt ++$TRAVIS_SCALA_VERSION assembly + - sbt ++$TRAVIS_SCALA_VERSION ci-release cache: directories: - $HOME/.sbt/1.0/dependency diff --git a/build.sbt b/build.sbt index 1c55338..367edd2 100644 --- a/build.sbt +++ b/build.sbt @@ -59,6 +59,7 @@ val catsEffectsSettings = Seq( lazy val thorp = (project in file(".")) .settings(commonSettings) .aggregate(cli, `thorp-lib`, `storage-aws`, core, `storage-api`, domain) + .settings(skip in publish := true) lazy val cli = (project in file("cli")) .settings(commonSettings) @@ -66,6 +67,7 @@ lazy val cli = (project in file("cli")) .settings(applicationSettings) .settings(commandLineParsing) .settings(testDependencies) + .settings(assemblyJarName in assembly := "thorp.jar") .dependsOn(`thorp-lib`) lazy val `thorp-lib` = (project in file("thorp-lib")) @@ -78,6 +80,7 @@ lazy val `storage-aws` = (project in file("storage-aws")) .settings(assemblyJarName in assembly := "storage-aws.jar") .settings(awsSdkDependencies) .settings(testDependencies) + .settings(skip in publish := true) .dependsOn(core % "compile->compile;test->test") lazy val core = (project in file("core")) @@ -85,11 +88,13 @@ lazy val core = (project in file("core")) .settings(assemblyJarName in assembly := "core.jar") .settings(testDependencies) .dependsOn(`storage-api`) + .settings(skip in publish := true) .dependsOn(domain % "compile->compile;test->test") lazy val `storage-api` = (project in file("storage-api")) .settings(commonSettings) .settings(assemblyJarName in assembly := "storage-api.jar") + .settings(skip in publish := true) .dependsOn(domain) lazy val domain = (project in file("domain")) @@ -97,3 +102,4 @@ lazy val domain = (project in file("domain")) .settings(assemblyJarName in assembly := "domain.jar") .settings(catsEffectsSettings) .settings(testDependencies) + .settings(skip in publish := true)