aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2018-08-01 14:51:32 -0700
committerJakob Odersky <jakob@driver.xyz>2018-08-01 22:56:14 -0700
commitc4b4d8fae745d998f50d6dcb6c0eabe7989feee7 (patch)
treee95a60ab02fdae929b74b3d88b1a686936f09e62
parent5ed91d1dd9a07da53a9da79abb7c5ff3c1f2dd74 (diff)
downloadsbt-settings-c4b4d8fae745d998f50d6dcb6c0eabe7989feee7.tar.gz
sbt-settings-c4b4d8fae745d998f50d6dcb6c0eabe7989feee7.tar.bz2
sbt-settings-c4b4d8fae745d998f50d6dcb6c0eabe7989feee7.zip
Use default versioning (git and env) only in library projects
-rw-r--r--src/main/scala/xyz.driver.sbt/Library.scala21
-rw-r--r--src/main/scala/xyz.driver.sbt/Service.scala1
-rw-r--r--src/main/scala/xyz.driver.sbt/Versioning.scala31
3 files changed, 20 insertions, 33 deletions
diff --git a/src/main/scala/xyz.driver.sbt/Library.scala b/src/main/scala/xyz.driver.sbt/Library.scala
index 0c46225..4e63f90 100644
--- a/src/main/scala/xyz.driver.sbt/Library.scala
+++ b/src/main/scala/xyz.driver.sbt/Library.scala
@@ -1,5 +1,8 @@
package xyz.driver.sbt
+import com.typesafe.sbt.GitPlugin
+import com.typesafe.sbt.SbtGit.git
+import java.time.Instant
import sbt.Keys._
import sbt._
import sbt.plugins.JvmPlugin
@@ -15,15 +18,29 @@ object Library extends AutoPlugin {
)
lazy val publicationSettings: Seq[Setting[_]] = Seq(
+ organization := "xyz.driver",
publishTo := {
val jfrog = "https://drivergrp.jfrog.io/drivergrp/"
- if (isSnapshot.value) Some("snapshots" at jfrog + "snapshots;build.timestamp=" + new java.util.Date().getTime)
+ if (isSnapshot.value) Some("snapshots" at jfrog + "snapshots;build.timestamp=" + Instant.now().toEpochMilli)
else Some("releases" at jfrog + "releases")
},
skip in publish := false
)
- override def buildSettings = Seq(
+ // Get version from git unless a VERSION environment variable is set
+ lazy val versionSettings: Seq[Setting[_]] = sys.env.get("VERSION") match {
+ case None =>
+ GitPlugin.autoImport.versionWithGit ++ Seq(
+ git.useGitDescribe := true, // get version from git
+ git.baseVersion := "0.0.0" // this version is used for new projects without any commits
+ )
+ case Some(v) =>
+ Seq(
+ version := v
+ )
+ }
+
+ override def buildSettings = versionSettings ++ Seq(
skip in publish := true
)
diff --git a/src/main/scala/xyz.driver.sbt/Service.scala b/src/main/scala/xyz.driver.sbt/Service.scala
index b35d215..df8a6af 100644
--- a/src/main/scala/xyz.driver.sbt/Service.scala
+++ b/src/main/scala/xyz.driver.sbt/Service.scala
@@ -60,6 +60,7 @@ object Service extends AutoPlugin {
override def projectSettings: Seq[Def.Setting[_]] =
Library.repositorySettings ++ buildInfoSettings ++ dockerSettings ++ Seq(
+ organization := "xyz.driver",
crossScalaVersions := List("2.12.6"),
scalaVersion := crossScalaVersions.value.last,
publish := {
diff --git a/src/main/scala/xyz.driver.sbt/Versioning.scala b/src/main/scala/xyz.driver.sbt/Versioning.scala
deleted file mode 100644
index fe3a218..0000000
--- a/src/main/scala/xyz.driver.sbt/Versioning.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package xyz.driver.sbt
-
-import com.typesafe.sbt.GitPlugin
-import com.typesafe.sbt.SbtGit.git
-import sbt.Keys._
-import sbt.plugins.JvmPlugin
-import sbt.{AutoPlugin, _}
-
-object Versioning extends AutoPlugin {
-
- override def requires = JvmPlugin
- override def trigger = allRequirements
-
- // Get version from git unless a VERSION environment variable is set
- lazy val versionSettings: Seq[Setting[_]] = sys.env.get("VERSION") match {
- case None =>
- GitPlugin.autoImport.versionWithGit ++ Seq(
- git.useGitDescribe := true, // get version from git
- git.baseVersion := "0.0.0" // this version is used for new projects without any commits
- )
- case Some(v) =>
- Seq(
- version := v
- )
- }
-
- override def buildSettings = versionSettings ++ Seq(
- organization := "xyz.driver"
- )
-
-}