Support sbt 1.0.0

tkawachi · tkawachi · commit e0f3b2f666e7 · 2017-08-12T22:31:30.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,17 @@
 language: scala
-
-script: sbt scripted
-
+matrix:
+  include:
+  - env: SBT_VERSION="0.13.16"
+    jdk: oraclejdk7
+  - env: SBT_VERSION="1.0.0"
+    jdk: oraclejdk8
+script: sbt "^^ ${SBT_VERSION}" test scripted
+cache:
+  directories:
+  - "$HOME/.ivy2/cache"
+  - "$HOME/.sbt/launchers"
 sudo: false
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
diff --git a/build.sbt b/build.sbt
@@ -1,16 +1,18 @@
-sbtPlugin := true
-
-name := "sbt-lock"
-
-organization := "com.github.tkawachi"
-
-licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT"))
-
-scmInfo := Some(ScmInfo(
-  url("https://github.com/tkawachi/sbt-lock/"),
-  "scm:git:github.com:tkawachi/sbt-lock.git"
-))
-
-scalacOptions ++= Seq(
-  "-deprecation"
-)
+lazy val root = project
+  .in(file("."))
+  .enablePlugins(BuildInfoPlugin)
+  .settings(
+    sbtPlugin := true,
+    crossSbtVersions := Vector("0.13.16", "1.0.0"),
+    name := "sbt-lock",
+    organization := "com.github.tkawachi",
+    licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
+    scmInfo := Some(
+      ScmInfo(
+        url("https://github.com/tkawachi/sbt-lock/"),
+        "scm:git:github.com:tkawachi/sbt-lock.git"
+      )),
+    scalacOptions ++= Seq(
+      "-deprecation"
+    )
+  )
diff --git a/buildinfo.sbt b/buildinfo.sbt
@@ -1,6 +1,6 @@
-buildInfoSettings
+//buildInfoSettings
 
-sourceGenerators in Compile <+= buildInfo
+//sourceGenerators in Compile += buildInfo.taskValue
 
 val _url = settingKey[URL]("_url")
 
diff --git a/lock.sbt b/lock.sbt
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1 @@
-sbt.version=0.13.7
-
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,8 @@
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.1")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.2")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 //addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.2.2")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.7")
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.7.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
 
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
diff --git a/publish.sbt b/publish.sbt
@@ -1,25 +1,18 @@
-import sbtrelease._
-import ReleaseStateTransformations._
+import ReleaseTransformations._
 
-sonatypeSettings
-
-releaseSettings
-
-def runTaskStep[A](task: TaskKey[A]) =
-  ReleaseStep(state => Project.extract(state).runTask(task, state)._1)
-
-ReleaseKeys.releaseProcess := Seq[ReleaseStep](
+releaseProcess := Seq[ReleaseStep](
   checkSnapshotDependencies,
   inquireVersions,
   runClean,
-  runTest,
+  releaseStepCommandAndRemaining("^ test"),
+  releaseStepCommandAndRemaining("^ scripted"),
   setReleaseVersion,
   commitReleaseVersion,
   tagRelease,
-  runTaskStep(PgpKeys.publishSigned),
+  releaseStepCommandAndRemaining("^ publishSigned"),
   setNextVersion,
   commitNextVersion,
-  runTaskStep(SonatypeKeys.sonatypeReleaseAll),
+  releaseStepCommand("sonatypeReleaseAll"),
   pushChanges
 )
 
diff --git a/scalariform.sbt b/scalariform.sbt
diff --git a/src/main/scala-sbt-0.13/com/github/tkawachi/sbtlock/Compat.scala b/src/main/scala-sbt-0.13/com/github/tkawachi/sbtlock/Compat.scala
@@ -0,0 +1,5 @@
+package com.github.tkawachi.sbtlock
+
+object Compat {
+  val dependencyOverridesType: String = "Set"
+}
diff --git a/src/main/scala-sbt-1.0/com/github/tkawachi/sbtlock/Compat.scala b/src/main/scala-sbt-1.0/com/github/tkawachi/sbtlock/Compat.scala
@@ -0,0 +1,5 @@
+package com.github.tkawachi.sbtlock
+
+object Compat {
+  val dependencyOverridesType: String = "Seq"
+}
diff --git a/src/main/scala/com/github/tkawachi/sbtlock/SbtLock.scala b/src/main/scala/com/github/tkawachi/sbtlock/SbtLock.scala
@@ -12,19 +12,24 @@ object SbtLock {
       Seq(organization, name, revision).map("\"" + _ + "\"").mkString(" % ")
   }
 
-  def doLock(allModules: Seq[ModuleID], depsHash: String, lockFile: File, log: Logger): File = {
+  def doLock(
+    allModules: Seq[ModuleID],
+    depsHash: String,
+    lockFile: File,
+    log: Logger): File = {
 
     val moduleLines = allModules
       .filter(m => m.organization != "org.scala-lang")
-      .map(mod => s"""  "${mod.organization}" % "${mod.name}" % "${mod.revision}"""")
+      .map(mod =>
+        s"""  "${mod.organization}" % "${mod.name}" % "${mod.revision}"""")
       .sorted
       .mkString(",\n")
 
     val dependencyOverrides =
       "// DON'T EDIT THIS FILE.\n" +
         s"// This file is auto generated by ${BuildInfo.name} ${BuildInfo.version}.\n" +
         s"// ${BuildInfo._url}\n" +
-        "dependencyOverrides in ThisBuild ++= Set(\n" +
+        s"dependencyOverrides in ThisBuild ++= ${Compat.dependencyOverridesType}(\n" +
         moduleLines + "\n" +
         ")\n" +
         SbtLock.DEPS_HASH_PREFIX + depsHash + "\n"
@@ -38,7 +43,9 @@ object SbtLock {
     if (lockFile.isFile) {
       val charset = Charset.forName("UTF-8")
       val lines = IO.read(lockFile, charset).split("\n")
-      lines.find(_.startsWith(DEPS_HASH_PREFIX)).map(_.drop(DEPS_HASH_PREFIX.length))
+      lines
+        .find(_.startsWith(DEPS_HASH_PREFIX))
+        .map(_.drop(DEPS_HASH_PREFIX.length))
     } else {
       None
     }
@@ -48,13 +55,18 @@ object SbtLock {
     val buildStruct = extracted.structure
     val buildUnit = buildStruct.units(buildStruct.root)
 
-    val lockFileName = EvaluateTask.getSetting(SbtLockKeys.sbtLockLockFile, DEFAULT_LOCK_FILE_NAME, extracted, buildStruct)
+    val lockFileName = EvaluateTask.getSetting(
+      SbtLockKeys.sbtLockLockFile,
+      DEFAULT_LOCK_FILE_NAME,
+      extracted,
+      buildStruct)
     new File(buildUnit.localBase, lockFileName)
   }
 
   val checkDepUpdates = (state: State) => {
     // TODO run for all projects
-    val (nextState, _) = Project.extract(state).runTask(SbtLockKeys.checkLockUpdate, state)
+    val (nextState, _) =
+      Project.extract(state).runTask(SbtLockKeys.checkLockUpdate, state)
     nextState
   }
 }
diff --git a/src/main/scala/com/github/tkawachi/sbtlock/SbtLockPlugin.scala b/src/main/scala/com/github/tkawachi/sbtlock/SbtLockPlugin.scala
@@ -9,10 +9,10 @@ object SbtLockPlugin extends AutoPlugin {
   override def trigger: PluginTrigger = AllRequirements
 
   object autoImport {
-    val sbtLockLockFile = SbtLockKeys.sbtLockLockFile
-    val lock = SbtLockKeys.lock
-    val unlock = SbtLockKeys.unlock
-    val checkLockUpdate = SbtLockKeys.checkLockUpdate
+    val sbtLockLockFile: SettingKey[String] = SbtLockKeys.sbtLockLockFile
+    val lock: TaskKey[File] = SbtLockKeys.lock
+    val unlock: TaskKey[Unit] = SbtLockKeys.unlock
+    val checkLockUpdate: TaskKey[Unit] = SbtLockKeys.checkLockUpdate
   }
 
   import autoImport._
@@ -21,60 +21,67 @@ object SbtLockPlugin extends AutoPlugin {
     SbtLockKeys.collectLockModuleIDs := {
       val classpath: Seq[Attributed[File]] =
         Classpaths.managedJars(Compile, classpathTypes.value, update.value)
+      val logger = sLog.value
 
       classpath.flatMap { entry =>
         for {
           art: Artifact <- entry.get(artifact.key)
           mod: ModuleID <- entry.get(moduleID.key)
         } yield {
-          sLog.value.debug(s"""[Lock] "${mod.organization}" % "${mod.name}" % "${mod.revision}"""")
+          logger.debug(
+            s"""[Lock] "${mod.organization}" % "${mod.name}" % "${mod.revision}"""")
           mod
         }
       }
     },
-
     lock := {
       val lockFile = new File(baseDirectory.value, sbtLockLockFile.value)
       val allModules = SbtLockKeys.collectLockModuleIDs.value
       val depsHash = ModificationCheck.hash((libraryDependencies in Compile).value)
       SbtLock.doLock(allModules, depsHash, lockFile, sLog.value)
     },
-
     unlock := {
       val lockFile = new File(baseDirectory.value, sbtLockLockFile.value)
       val deleted = lockFile.delete()
+      val logger = sLog.value
       if (!deleted) {
-        sLog.value.warn(s"Failed to delete $lockFile")
+        logger.warn(s"Failed to delete $lockFile")
       }
     },
-
     checkLockUpdate := {
       val lockFile = new File(baseDirectory.value, sbtLockLockFile.value)
-      val currentHash = ModificationCheck.hash((libraryDependencies in Compile).value)
+      val currentHash =
+        ModificationCheck.hash((libraryDependencies in Compile).value)
+      val logger = sLog.value
       SbtLock.readDepsHash(lockFile) match {
         case Some(hashInFile) =>
           if (hashInFile != currentHash) {
-            sLog.value.debug(s"hashInFile: $hashInFile, currentHash: $currentHash")
-            sLog.value.warn(s"libraryDependencies is updated after ${lockFile.name} was created.")
-            sLog.value.warn(s"Run `;unlock ;reload ;lock` to re-create ${lockFile.name}.")
-            sLog.value.warn(s"Run just `lock` instead if you want to keep existing library versions.")
+            logger.debug(s"hashInFile: $hashInFile, currentHash: $currentHash")
+            logger.warn(
+              s"libraryDependencies is updated after ${lockFile.name} was created.")
+            logger.warn(
+              s"Run `;unlock ;reload ;lock` to re-create ${lockFile.name}.")
+            logger.warn(
+              s"Run just `lock` instead if you want to keep existing library versions.")
           } else {
-            sLog.value.info(s"${lockFile.name} is up to date.")
+            logger.info(s"${lockFile.name} is up to date.")
           }
         case None =>
           if (lockFile.isFile) {
-            sLog.value.warn(s"${lockFile.name} seems to be created with old version of ${BuildInfo.name}.")
-            sLog.value.warn(s"Run `;unlock ;reload ;lock` to re-create ${lockFile.name}.")
-            sLog.value.warn(s"Run just `lock` instead if you want to keep existing library versions.")
+            logger.warn(
+              s"${lockFile.name} seems to be created with old version of ${BuildInfo.name}.")
+            logger.warn(
+              s"Run `;unlock ;reload ;lock` to re-create ${lockFile.name}.")
+            logger.warn(
+              s"Run just `lock` instead if you want to keep existing library versions.")
           } else if (!lockFile.exists()) {
-            sLog.value.info(s"${lockFile.name} doesn't exist. Run `lock` to create one.")
+            logger.info(
+              s"${lockFile.name} doesn't exist. Run `lock` to create one.")
           }
       }
-    }
-  )
+    })
 
   override val globalSettings = Seq(
     onLoad in Global ~= { _ compose SbtLock.checkDepUpdates },
-    sbtLockLockFile := DEFAULT_LOCK_FILE_NAME
-  )
+    sbtLockLockFile := DEFAULT_LOCK_FILE_NAME)
 }
diff --git a/src/sbt-test/sbt-lock/force/build.sbt b/src/sbt-test/sbt-lock/force/build.sbt
@@ -1,26 +1,26 @@
 import sbt._
 
-
 resolvers += Resolver.typesafeRepo("releases")
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
   "org.yaml" % "snakeyaml" % "1.15",
   "com.typesafe.play" %% "play" % "2.5.6", // use a guava 16
-  "com.google.guava" % "guava" % "15.0" force() //force  older version of guava
+  "com.google.guava" % "guava" % "15.0" force () //force  older version of guava
 )
 
-
 def check(module: Seq[String], dependencies: Set[ModuleID]): Boolean = {
   val Seq(org, name, v) = module
-  dependencies.exists{ m =>
+  dependencies.exists { m =>
     m.organization == org && m.name == name && m.revision == v
   }
 }
 
 InputKey[Unit]("checkExistsDependency") := {
   val module = complete.Parsers.spaceDelimited("").parsed
-  val exists = check(module, dependencyOverrides.value)
-  assert(exists, s"${module.mkString(":")} should exist in dependencyOverrides: ${dependencyOverrides.value}")
+  val exists = check(module, dependencyOverrides.value.toSet)
+  assert(
+    exists,
+    s"${module.mkString(":")} should exist in dependencyOverrides: ${dependencyOverrides.value}")
 }
diff --git a/src/sbt-test/sbt-lock/force/project/build.properties b/src/sbt-test/sbt-lock/force/project/build.properties
diff --git a/src/sbt-test/sbt-lock/simple/build.sbt b/src/sbt-test/sbt-lock/simple/build.sbt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-sbt.version=0.13.7`
`2`		`-`
	`1`	`+sbt.version=0.13.16`