diff options
author | vlad <vlad@drivergrp.com> | 2016-08-10 10:19:01 -0700 |
---|---|---|
committer | vlad <vlad@drivergrp.com> | 2016-08-10 10:19:01 -0700 |
commit | dcb8a3a73982e5229ce7034eddf88da00862cd15 (patch) | |
tree | 2fcae8ca22c17a91b57353a97954bca364ac2a75 | |
parent | 9ef3f3e1b1842913474a34dd45b9bb22d33b319a (diff) | |
download | sbt-settings-dcb8a3a73982e5229ce7034eddf88da00862cd15.tar.gz sbt-settings-dcb8a3a73982e5229ce7034eddf88da00862cd15.tar.bz2 sbt-settings-dcb8a3a73982e5229ce7034eddf88da00862cd15.zip |
Separated settings for publication and dependencies
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 29 | ||||
-rw-r--r-- | version.sbt | 2 |
3 files changed, 23 insertions, 12 deletions
@@ -23,6 +23,10 @@ Provides common sbt configuration for sbt itself, Scala compiler, testing, linti .packagingConfiguration // Currently packages to zip file as java server app + .settings(repositoriesSettings) // To use dependencies from Driver jar repository + + .settings(publicationSettings) // Publishing to Driver jar repository + .settings(releaseSettings) // Release process configuration .dockerConfiguration // Docker containerization settings diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index 5c8ec32..5eeae86 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -31,6 +31,23 @@ object SbtSettings extends AutoPlugin { lazy val testAll = TaskKey[Unit]("test-all", "Launches all unit and integration tests") + lazy val repositoriesSettings = { + Seq( + resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases", + resolvers += "snapshots" at "https://drivergrp.jfrog.io/drivergrp/snapshots", + credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "***REMOVED***")) + } + + lazy val publicationSettings = Seq( + // publishTo := Some(Resolver.file("file", new File("releases"))) + publishTo := { + val jfrog = "https://drivergrp.jfrog.io/drivergrp/" + + if (isSnapshot.value) Some("snapshots" at jfrog + "snapshots;build.timestamp=" + new java.util.Date().getTime) + else Some("releases" at jfrog + "releases") + }, + credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "***REMOVED***")) + lazy val releaseSettings = { def setVersionOnly(selectVersion: Versions => String): ReleaseStep = { st: State => val vs = st.get(ReleaseKeys.versions).getOrElse( @@ -161,16 +178,6 @@ object SbtSettings extends AutoPlugin { testExecution in (Test, test) <<= (testExecution in (Test, test)) dependsOn (scalafmtTest in Compile, scalafmtTest in Test)) - lazy val publicationSettings = Seq( - // publishTo := Some(Resolver.file("file", new File("releases"))) - publishTo := { - val jfrog = "https://drivergrp.jfrog.io/drivergrp/" - - if (isSnapshot.value) Some("snapshots" at jfrog + "snapshots;build.timestamp=" + new java.util.Date().getTime) - else Some("releases" at jfrog + "releases") - }, - credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "***REMOVED***")) - override def trigger: PluginTrigger = allRequirements override def projectSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq ( organization := "com.drivergrp", @@ -200,5 +207,5 @@ object SbtSettings extends AutoPlugin { fork in run := true, compileScalastyle := (scalastyle in Compile).toTask("").value, (compile in Compile) <<= ((compile in Compile) dependsOn compileScalastyle) - ) ++ publicationSettings ++ wartRemoverSettings ++ scalafmtSettings + ) ++ wartRemoverSettings ++ scalafmtSettings }
\ No newline at end of file diff --git a/version.sbt b/version.sbt index 5492cbd..0731f9c 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.4.1-SNAPSHOT" +version in ThisBuild := "0.4.3-SNAPSHOT" |