Skip to content
This repository has been archived by the owner on Feb 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #103 from eed3si9n/topic/0.4.0
Browse files Browse the repository at this point in the history
Prepping for 0.4.0
  • Loading branch information
eed3si9n authored Apr 19, 2017
2 parents e9eb7e5 + 91a5aac commit ebbc72a
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 102 deletions.
11 changes: 11 additions & 0 deletions CONTRIBUTING.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### releasing steps

```
jenv shell 1.7
sbt
> publishSigned
jenv shell 1.8
# uncomment build.sbt parts
sbt
> publishSigned
```
73 changes: 42 additions & 31 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
organization := "me.lessis"
name := "bintray-sbt"
version := "0.3.0"
description := "package publisher for bintray.com"
homepage := Some(url(s"https://github.com/softprops/${name.value}#readme"))
sbtPlugin := true
libraryDependencies ++= Seq(
"me.lessis" %% "bintry" % "0.4.0",
"org.slf4j" % "slf4j-nop" % "1.7.7") // https://github.com/softprops/bintray-sbt/issues/26
scalacOptions ++= Seq(Opts.compile.deprecation, "-feature")
resolvers += Resolver.sonatypeRepo("releases")
licenses ++= Seq("MIT" -> url(
s"https://github.com/softprops/${name.value}/blob/${version.value}/LICENSE"))
publishArtifact in Test := false
pomExtra := (
<scm>
<url>git@github.com:softprops/{name.value}.git</url>
<connection>scm:git:git@github.com:softprops/{name.value}.git</connection>
</scm>
<developers>
<developer>
<id>softprops</id>
<name>Doug Tangren</name>
<url>https://github.com/softprops</url>
</developer>
</developers>
)
lsSettings
externalResolvers in LsKeys.lsync := (resolvers in bintray).value
bintrayRepository := "sbt-plugin-releases"
bintrayOrganization := Some("sbt")
lazy val unusedWarnings = Seq("-Ywarn-unused-import", "-Ywarn-unused")

lazy val commonSettings: Seq[Setting[_]] = Seq(
version in ThisBuild := "0.4.0-SNAPSHOT",
organization in ThisBuild := "org.foundweekends",
homepage in ThisBuild := Some(url(s"https://github.com/sbt/${name.value}/#readme")),
licenses in ThisBuild := Seq("MIT" ->
url(s"https://github.com/sbt/${name.value}/blob/${version.value}/LICENSE")),
description in ThisBuild := "package publisher for bintray.com",
developers in ThisBuild := List(
Developer("softprops", "Doug Tangren", "@softprops", url("https://github.com/softprops"))
),
scmInfo in ThisBuild := Some(ScmInfo(url(s"https://github.com/sbt/${name.value}"), s"[email protected]:sbt/{name.value}.git")),
// crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8", "2.12.2"),
scalaVersion := (crossScalaVersions in ThisBuild).value.last,
scalacOptions ++= Seq(Opts.compile.deprecation, "-Xlint", "-feature"),
scalacOptions ++= PartialFunction.condOpt(CrossVersion.partialVersion(scalaVersion.value)){
case Some((2, v)) if v >= 11 => unusedWarnings
}.toList.flatten,
publishArtifact in Test := false,
bintrayRepository := "sbt-plugin-releases",
bintrayOrganization := Some("sbt"),
bintrayPackage := "sbt-bintray"
) ++ Seq(Compile, Test).flatMap(c =>
scalacOptions in (c, console) --= unusedWarnings
)

lazy val root = (project in file("."))
.settings(
name := "sbt-bintray",
sbtPlugin := true,
libraryDependencies ++= Seq(
"org.foundweekends" %% "bintry" % "0.5.0",
"org.slf4j" % "slf4j-nop" % "1.7.7"), // https://github.com/softprops/bintray-sbt/issues/26
resolvers += Resolver.sonatypeRepo("releases")
)
// .settings(
// scalaVersion := "2.12.2",
// sbtVersion in Global := "1.0.0-M5",
// scalaCompilerBridgeSource :=
// ("org.scala-sbt" % "compiler-interface" % "0.13.15" % "component").sources
// )
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resolvers += Resolver.url(
url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
Resolver.ivyStylePatterns)

addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
// addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")

addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

Expand Down
21 changes: 0 additions & 21 deletions src/main/ls/0.1.0.json

This file was deleted.

21 changes: 0 additions & 21 deletions src/main/ls/0.1.1.json

This file was deleted.

25 changes: 0 additions & 25 deletions src/main/ls/0.1.2.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/scala/Bintray.scala
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ object Bintray {
def resolveVcsUrl: Try[Option[String]] =
Try {
val pushes =
sbt.Process("git" :: "remote" :: "-v" :: Nil).!!.split("\n")
sys.process.Process("git" :: "remote" :: "-v" :: Nil).!!.split("\n")
.map {
_.split("""\s+""") match {
case Array(name, url, "(push)") =>
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/BintrayPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sbt.{ AutoPlugin, Credentials, Global, Path, Resolver, Setting, Task, Tag
import sbt.Classpaths.publishTask
import sbt.Def.{ Initialize, setting, task, taskDyn }
import sbt.Keys._
import sbt.Path.richFile
import sbt._

object BintrayPlugin extends AutoPlugin {
import BintrayKeys._
Expand Down

0 comments on commit ebbc72a

Please sign in to comment.