Skip to content
Permalink
Browse files

Upgrade slf4j

  • Loading branch information...
mattroberts297 committed Apr 12, 2017
1 parent 5b1b570 commit 96d271e60be59d97a3a8d629f6ea500f679952e5
Showing with 70 additions and 30 deletions.
  1. +2 −0 .gitignore
  2. +17 −4 .travis.yml
  3. +46 −23 build.sbt
  4. +5 −3 project/plugins.sbt
  5. BIN public.asc.enc
  6. BIN secret.asc.enc
@@ -15,3 +15,5 @@ project/target/
.scala_dependencies
.idea
.idea_modules

local.*
@@ -5,12 +5,25 @@ scala:

jdk:
- oraclejdk8
- oraclejdk7
- openjdk7
- openjdk6

sudo: false

script: "sbt clean coverage test"
before_install:
- openssl aes-256-cbc -pass pass:$PGP_PASSPHRASE -in secret.asc.enc -out local.secret.asc -d
- openssl aes-256-cbc -pass pass:$PGP_PASSPHRASE -in public.asc.enc -out local.public.asc -d

script: "sbt clean coverage test coverageReport"

after_success: "sbt coveralls"

deploy:
skip_cleanup: true
provider: script
script: sbt publishSigned sonatypeRelease
on:
tags: true

env:
global:
- secure: "Km7zfQR5Q4auR1tWeVNLrdTgRcwCxndszN81LIIlrYiL9t7dh3rL/CzmT+N433grNB6Y6yZgRHiLCF3mhRjZk0rjDxvhrQ+1r1PRJZOSlKXre2PQSTq+xAGkeUpKAJKtbRKQ5nCwyNyOlniHnbkck6XIKklESkMCntA4g/Fn4Dw="
- secure: "GGrBEUcd+kuchKaGAP7LLZ/ZshtNKRuNWwOZZBxNduSRq4Q3t2eTrRhyjgO+wmfsni5SLNA/tpqvdrjU0FQGtO/UrUd+OweFJ4JQ1niTJbYuewEWRGXpXybo7HV3jeWMQt7RkJIYqOUwCNHZnSMV0xJNEyIXrX9XSVwfyNZpDDA="
@@ -3,36 +3,59 @@ lazy val slf4s = (project in file(".")).settings(
name := "slf4s-api",
scalaVersion := "2.10.6",
scalacOptions := Seq("-unchecked", "-deprecation", "-language:experimental.macros"),
version := "1.7.13",
version := "1.7.25",
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.slf4j" % "slf4j-api" % version.value,
"org.scalatest" %% "scalatest" % "3.0.1" % "test",
"org.mockito" % "mockito-core" % "2.7.22" % "test",
"ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
),

pgpPassphrase := Option(env("PGP_PASSPHRASE")).map(_.toCharArray),
pgpSecretRing := file("local.secret.asc"),
pgpPublicRing := file("local.public.asc"),

credentials += Credentials(
"Sonatype Nexus Repository Manager",
"oss.sonatype.org",
"mattroberts297",
env("SONATYPE_PASSWORD")
),

publishMavenStyle := true,
publishArtifact in Test := false,
pomIncludeRepository := { _ => false },
makePomConfiguration ~= { _.copy(configurations = Some(Seq(Compile, Runtime, Optional))) },
licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
homepage := Some(url("http://slf4s.org/")),
scmInfo := Some(ScmInfo(url("https://github.com/mattroberts297/slf4s"), "https://github.com/mattroberts297/slf4s", None)),
pomExtra := (
<developers>
<developer>
<id>mattroberts297</id>
<name>Matt Roberts</name>
<email>mattroberts297@gmail.com</email>
<url>http://mattro.be/rts/</url>
</developer>
</developers>
),
publishTo := {
val nexus = "https://oss.sonatype.org/"
if (isSnapshot.value)
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.slf4j" % "slf4j-api" % version.value,
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
"org.mockito" % "mockito-all" % "1.10.19" % "test",
"ch.qos.logback" % "logback-classic" % "1.1.3" % "test"

makePomConfiguration ~= {
_.copy(configurations = Some(Seq(Compile, Runtime, Optional)))
},
pomIncludeRepository := {
_: sbt.MavenRepository => false
},

licenses := Seq("MIT" -> url("https://github.com/mattroberts297/slf4s/blob/master/LICENSE")),
homepage := Some(url("http://slf4s.org/")),
scmInfo := Some(
ScmInfo(
url("https://github.com/mattroberts297/slf4s"),
"scm:git@github.com:mattroberts297/slf4s.git"
)
),
developers := List(
Developer(
id = "mattroberts297",
name = "Matt Roberts",
email = "mail@mattroberts.io",
url = url("https://mattroberts.io")
)
)
)

def env(name: String): String = System.getenv().get(name)
@@ -1,5 +1,7 @@
resolvers += Classpaths.sbtPluginReleases
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
BIN +3.03 KB public.asc.enc
Binary file not shown.
BIN +6.55 KB secret.asc.enc
Binary file not shown.

0 comments on commit 96d271e

Please sign in to comment.
You can’t perform that action at this time.