Skip to content

Commit

Permalink
Added cross path publishing to support scala 2.10 and 2.11
Browse files Browse the repository at this point in the history
Need scala 2.10 support to enable compatibility with SBT plugin, threw
in scala 2.11 as a bonus

version: 0.6.1
tag: Added
  • Loading branch information
zumhagen committed Jun 29, 2017
1 parent 3e50273 commit 4ab9071
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ before_install:
script:
- sbt clean coverage test coverageReport && sbt coverageAggregate
after_success:
- sbt coveralls publish-signed sonatypeRelease
- sbt coveralls "+ publish-signed sonatypeRelease"
env:
global:
secure: jCH+Q32wtrntJJuqtMBXbmJEVzjIw2hXEBac/xaUMnEoaqsBrqlALXI3uOQ3N5Wldrz6n0zs47ZHSpylYRRKoIhqyuT6IENmFNlkScWKWY1Q6HCFUmVwmHIbsuXdr7ZBji6I/VEEX/ZsrjUajVl4mPBBoYdx5B98AHcYkThxt8ZtQM9sscvVNSusgOlO8X2NNsLpKSEP90olzrGkNpsSGa1+YS+F6GZmHfbt4AZZL91e9wNWpBjK7RNCd8C8PoqG/KolIGy1OIi52qqiLJe1H1WGhVw/mdyXFo6s+Px5UndXIkF4qwlBef9+qN40DGxNRKixWQ/ll91/N9jUCUTOZZYxlgJemASWBg60cs4M1tHCuwuqGkXNahhcCrd/PesL3RXO2KunscPL4ZL4w51gOROMqNyO6v6YpDHiIHsf6NCHu0XnNAzwMxWNjgm0jHP6TBKd2XDYd1ciwqOq2Yw+y62l9rfRXT2FO2R6Zpnt5d8/Gbb/Pp+snO9eSXRJGcYTkuwDNJx52xDLQSF1n3sifItLu1Danu3LAzT8jzHSL7gqGv5rRy8jwqCtHG82RyGBr+uuYuSGJHqFi7OqxkK/UOHe7fbWqtvGIavxyptwVExm+Rs57raYRRDs6Kp3KZQuQ+aoB6WfA9iEQMb6AbNDPMqxPP46OcO6Sl7PXStei0g=
15 changes: 12 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,31 @@ version := "0.6.0"

scalaVersion := "2.12.1"

crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.1")

libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.3.1",
"com.github.zafarkhaja" % "java-semver" % "0.9.0",
"org.apache.commons" % "commons-lang3" % "3.5",
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.8.0.201705170830-rc1",
"com.github.pathikrit" %% "better-files" % "3.0.0",
"ch.qos.logback" % "logback-classic" % "1.1.7",
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
"org.slf4j" % "slf4j-api" % "1.7.5",
"org.slf4j" % "slf4j-simple" % "1.7.5",
"org.scalatra.scalate" %% "scalate-core" % "1.8.0",
"org.scalactic" %% "scalactic" % "3.0.1",
"com.github.scopt" %% "scopt" % "3.6.0",
"com.github.pathikrit" %% "better-files" % "3.0.0",
"org.scalatest" %% "scalatest" % "3.0.1" % Test,
"junit" % "junit" % "4.12" % Test
)

libraryDependencies <++= scalaVersion ( sv => Seq(betterFiles(sv)) )

def betterFiles(scalaVersion: String) = scalaVersion match {
case "2.12.1" => "com.github.pathikrit" %% "better-files" % "3.0.0"
case "2.11.11" => "com.github.pathikrit" %% "better-files" % "2.17.1"
case _ => "com.github.pathikrit" %% "better-files" % "2.17.0"
}

coverageEnabled := true

pgpSecretRing := file("local.secring.asc")
Expand Down
11 changes: 3 additions & 8 deletions src/main/scala/com/github/bzumhagen/sct/git/GitChangelog.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@ package com.github.bzumhagen.sct.git
import java.time.{Instant, ZoneId}

import better.files.File
import com.github.bzumhagen.sct.{
ChangeGroup,
Changelog,
ChangelogChange,
ChangelogConfiguration
}
import com.github.bzumhagen.sct.{ChangeGroup, Changelog, ChangelogChange, ChangelogConfiguration}
import com.github.zafarkhaja.semver.Version
import com.typesafe.scalalogging.Logger
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.revwalk.RevCommit

import scala.collection.JavaConverters._
import org.fusesource.scalate._
import org.slf4j.LoggerFactory

import scala.util.matching.Regex

class GitChangelog(val config: ChangelogConfiguration, val gitDir: File) extends Changelog {
private val logger = Logger[GitChangelog]
private val logger = LoggerFactory.getLogger(classOf[GitChangelog])

override def getChanges: Seq[ChangelogChange] = {
val gitRepository = Git.open(gitDir.toJava)
Expand Down

0 comments on commit 4ab9071

Please sign in to comment.