From 2853f18feed65f2c74eb2ccfba7baf0e7c163b98 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 9 Aug 2016 10:56:36 -0700 Subject: Usage of the Artifactory for publication and artifacts lookup --- build.sbt | 10 ++++- src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 45 +++++++++------------- version.sbt | 2 +- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/build.sbt b/build.sbt index 2b990b3..b0690fb 100644 --- a/build.sbt +++ b/build.sbt @@ -22,4 +22,12 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0") // This plugin represents functionality that is to be added to sbt in the future -addSbtPlugin("org.scala-sbt" % "sbt-core-next" % "0.1.1") \ No newline at end of file +addSbtPlugin("org.scala-sbt" % "sbt-core-next" % "0.1.1") + +publishTo := { + val jfrog = "https://drivergrp.jfrog.io/drivergrp/" + if (isSnapshot.value) Some("snapshots" at jfrog + "snapshots") + else Some("releases" at jfrog + "releases") +} + +credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "***REMOVED***") diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index e633e64..9b761fb 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -1,9 +1,6 @@ package com.drivergrp.sbt -import sbt._ import sbt.Keys._ - -import java.io.File import com.typesafe.sbt.SbtGit.git import com.typesafe.sbt.SbtNativePackager.Universal import com.typesafe.sbt.packager.SettingsHelper._ @@ -11,7 +8,7 @@ import com.typesafe.sbt.packager.archetypes.JavaServerAppPackaging import com.typesafe.sbt.{GitBranchPrompt, GitVersioning} import org.scalafmt.sbt.ScalaFmtPlugin.autoImport._ import org.scalastyle.sbt.ScalastylePlugin._ -import sbt.{Project, Resolver, State, _} +import sbt.{Credentials, Project, State, _} import sbtassembly.AssemblyKeys._ import sbtassembly._ import sbtbuildinfo.BuildInfoPlugin @@ -74,27 +71,6 @@ object SbtSettings extends AutoPlugin { ) } - lazy val publicationSettings = Seq( - publishTo := Some(Resolver.file("file", new File("releases"))) - - // publishTo := { // TODO: For actual Driver jar repo - // val nexus = "https://my.artifact.repo.net/" - // if (isSnapshot.value) - // Some("snapshots" at nexus + "content/repositories/snapshots") - // else - // Some("releases" at nexus + "service/local/staging/deploy/maven2") - // } - - // publishTo <<= (version, sbtPlugin) { (v: String, isPlugin: Boolean) => - // val root = "http://artifacts.example.com/sharethrough" - // val layout = if (isPlugin) Resolver.ivyStylePatterns else Resolver.mavenStylePatterns - // val status = if (v.trim.endsWith("SNAPSHOT")) "snapshot" else "release" - // val repository = s"libs-${status}s-local" - // - // Some(Resolver.url(repository, new URL(s"$root/$repository/"))(layout)) - // } - ) - lazy val acyclicSettings = Seq( autoCompilerPlugins := true, addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.4")) @@ -111,7 +87,7 @@ object SbtSettings extends AutoPlugin { git.useGitDescribe := true, git.baseVersion := "0.0.0", git.gitTagToVersionNumber := { - case VersionRegex(v, "SNAPSHOT") => Some(s"$ v-SNAPSHOT") + case VersionRegex(v, "SNAPSHOT") => Some(s"$v-SNAPSHOT") case VersionRegex(v, "") => Some(v) case VersionRegex(v, s) => Some(s"$v-$s-SNAPSHOT") case _ => None @@ -185,6 +161,16 @@ 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") + 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", @@ -206,6 +192,11 @@ object SbtSettings extends AutoPlugin { "-Ywarn-unused-import" ), + resolvers ++= Seq( + "snapshots" at "https://drivergrp.jfrog.io/drivergrp/snapshots", + "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" + ), + libraryDependencies ++= Seq( "org.scalaz" %% "scalaz-core" % "7.2.4", "com.lihaoyi" %% "acyclic" % "0.1.4" % "provided" @@ -214,5 +205,5 @@ object SbtSettings extends AutoPlugin { fork in run := true, compileScalastyle := (scalastyle in Compile).toTask("").value, (compile in Compile) <<= ((compile in Compile) dependsOn compileScalastyle) - ) ++ wartRemoverSettings ++ scalafmtSettings + ) ++ wartRemoverSettings ++ scalafmtSettings ++ publicationSettings } \ No newline at end of file diff --git a/version.sbt b/version.sbt index e765444..03a8b07 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.1.0" +version in ThisBuild := "0.2.0-SNAPSHOT" -- cgit v1.2.3