diff --git a/build.sbt b/build.sbt index aa9aaeedb..39eceba3f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,17 +2,6 @@ import Dependencies._ def internalPath = file("internal") -// ThisBuild settings take lower precedence, -// but can be shared across the multi projects. -def buildLevelSettings: Seq[Setting[_]] = Seq( - organization in ThisBuild := "org.scala-sbt.librarymanagement", - version in ThisBuild := "1.0.0-SNAPSHOT" - // bintrayOrganization in ThisBuild := Some("sbt"), - // // bintrayRepository in ThisBuild := s"ivy-${(publishStatus in ThisBuild).value}", - // bintrayPackage in ThisBuild := "sbt", - // bintrayReleaseOnPublish in ThisBuild := false -) - def commonSettings: Seq[Setting[_]] = Seq( scalaVersion := "2.10.5", // publishArtifact in packageDoc := false, @@ -21,16 +10,34 @@ def commonSettings: Seq[Setting[_]] = Seq( // concurrentRestrictions in Global += Util.testExclusiveRestriction, testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"), javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"), - incOptions := incOptions.value.withNameHashing(true) + incOptions := incOptions.value.withNameHashing(true), // crossScalaVersions := Seq(scala210) // bintrayPackage := (bintrayPackage in ThisBuild).value, - // bintrayRepository := (bintrayRepository in ThisBuild).value + // bintrayRepository := (bintrayRepository in ThisBuild).value, + resolvers += Resolver.sonatypeRepo("public") ) lazy val root = (project in file(".")). aggregate(lm). settings( - buildLevelSettings, + inThisBuild(Seq( + organization := "org.scala-sbt", + version := "0.1.0-SNAPSHOT", + homepage := Some(url("https://github.com/sbt/librarymanagement")), + description := "Library management module for sbt", + licenses := List("BSD New" -> url("https://github.com/sbt/sbt/blob/0.13/LICENSE")), + scmInfo := Some(ScmInfo(url("https://github.com/sbt/librarymanagement"), "git@github.com:sbt/librarymanagement.git")), + developers := List( + Developer("harrah", "Mark Harrah", "@harrah", url("https://github.com/harrah")), + Developer("eed3si9n", "Eugene Yokota", "@eed3si9n", url("https://github.com/eed3si9n")), + Developer("jsuereth", "Josh Suereth", "@jsuereth", url("https://github.com/jsuereth")), + Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand")) + ), + bintrayReleaseOnPublish := false, + bintrayOrganization := Some("sbt"), + bintrayRepository := "maven-releases", + bintrayPackage := "librarymanagement" + )), commonSettings, // rootSettings, publish := {}, @@ -40,7 +47,7 @@ lazy val root = (project in file(".")). lazy val lm = (project in file("librarymanagement")). settings( commonSettings, - libraryDependencies ++= Seq(utilLogging % "compile;test->test", ioProj % "compile;test->test", utilCollection), + libraryDependencies ++= Seq(utilLogging, ioProj, utilCollection), libraryDependencies ++= Seq(ivy, jsch, sbtSerialization, scalaReflect.value, launcherInterface), name := "librarymanagement" ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7246cdf9e..e0f1916fc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,11 +2,11 @@ import sbt._ import Keys._ object Dependencies { - val utilVersion = "1.0.0-SNAPSHOT" - val bootstrapSbtVersion = "0.13.8" - lazy val ioProj = "org.scala-sbt" % "io" % bootstrapSbtVersion - lazy val utilCollection = "org.scala-sbt.util" %% "util-collection" % utilVersion - lazy val utilLogging = "org.scala-sbt.util" %% "util-logging" % utilVersion + val utilVersion = "0.1.0-M1" + val ioVersion = "1.0.0-M1" + lazy val ioProj = "org.scala-sbt" %% "io" % ioVersion + lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion + lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0-M1" lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-927bc9ded7f8fba63297cddd0d5a3d01d6ad5d8d" diff --git a/project/bintray.sbt b/project/bintray.sbt new file mode 100644 index 000000000..8dd913f98 --- /dev/null +++ b/project/bintray.sbt @@ -0,0 +1 @@ +addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")