Merge pull request #11 from rtyley/bump-deps

Drop Scala 2.12, only support 2.13, bump deps

Author: rtyley

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+on:
+  workflow_dispatch:
+  pull_request:
+
+  # triggering CI default branch improves caching
+  # see https://docs.github.com/en/free-pro-team@latest/actions/guides/caching-dependencies-to-speed-up-workflows#restrictions-for-accessing-a-cache
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: sbt
+      - name: Build and Test
+        run: sbt -v +test
+      - name: Test Summary
+        uses: test-summary/action@v2
+        with:
+          paths: "test-results/**/TEST-*.xml"
+        if: always()

.gitignore

@@ -16,3 +16,6 @@ project/plugins/project/
 .scala_dependencies
 .worksheet
 .idea
+
+.bsp/
+test-results/

.travis.yml

@@ -1,21 +1,25 @@
 import ReleaseTransformations._
 
 lazy val baseSettings = Seq(
-  scalaVersion := "2.13.0",
-  crossScalaVersions := Seq(scalaVersion.value, "2.12.8"),
+  scalaVersion := "2.13.10",
+  crossScalaVersions := Seq(scalaVersion.value),
   organization := "com.madgag.scala-git",
   scmInfo := Some(ScmInfo(
     url("https://github.com/rtyley/scala-git"),
     "scm:git:[email protected]:rtyley/scala-git.git"
   )),
   licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
-  scalacOptions ++= Seq("-deprecation", "-Xlint", "-unchecked")
+  scalacOptions ++= Seq("-deprecation", "-unchecked")
 )
 
-lazy val `scala-git` = project.settings(baseSettings: _*).dependsOn(`scala-git-test` % "test")
+lazy val `scala-git` = project.settings(baseSettings: _*).dependsOn(`scala-git-test` % Test)
 
 lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(baseSettings: _*)
 
+ThisBuild / Test / testOptions +=
+  Tests.Argument(TestFrameworks.ScalaTest, "-u", s"test-results/scala-${scalaVersion.value}")
+
+
 lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).
   settings(baseSettings: _*).settings(
   publishArtifact := false,
@@ -30,10 +34,11 @@ lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).
     setReleaseVersion,
     commitReleaseVersion,
     tagRelease,
-    releaseStepCommand("publishSigned"),
+    // For non cross-build projects, use releaseStepCommand("publishSigned")
+    releaseStepCommandAndRemaining("+publishSigned"),
+    releaseStepCommand("sonatypeBundleRelease"),
     setNextVersion,
     commitNextVersion,
-    releaseStepCommand("sonatypeReleaseAll"),
     pushChanges
   )
 )

build.sbt

@@ -6,10 +6,10 @@ object Dependencies {
   val eclipseJgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "4.0.1.201506240215-r"
   val jgit = eclipseJgit
 
-  val scalatest = "org.scalatest" %% "scalatest" % "3.0.8"
+  val scalatest = "org.scalatest" %% "scalatest" % "3.2.14"
 
   val madgagCompress = "com.madgag" % "util-compress" % "1.33"
 
-  val guava = Seq("com.google.guava" % "guava" % "18.0", "com.google.code.findbugs" % "jsr305" % "2.0.1")
+  val guava = Seq("com.google.guava" % "guava" % "31.1-jre", "com.google.code.findbugs" % "jsr305" % "2.0.1")
 
 }

project/Dependencies.scala

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.8.0

project/build.properties

@@ -1,5 +1,5 @@
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.4")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15")

project/plugins.sbt

@@ -4,5 +4,6 @@ description := "Scala veneer for JGit"
 
 libraryDependencies ++= Seq(
   jgit,
-  scalatest % "test"
+  "com.madgag" %% "scala-collection-plus" % "0.11",
+  scalatest % Test
 )

scala-git/build.sbt

@@ -1,5 +1,7 @@
 package com.madgag.diff
 
+import com.madgag.scala.collection.decorators.MapDecorator
+
 object MapDiff {
   def apply[K,V](before: Map[K,V], after: Map[K,V]): MapDiff[K,V] =
     MapDiff(Map(Before -> before, After -> after))
@@ -10,14 +12,14 @@ case class MapDiff[K, V](beforeAndAfter: Map[BeforeAndAfter, Map[K,V]]) {
   lazy val commonElements: Set[K] = beforeAndAfter.values.map(_.keySet).reduce(_ intersect _)
 
   lazy val only: Map[BeforeAndAfter, Map[K,V]] =
-    beforeAndAfter.mapValues(_.filterKeys(!commonElements(_)).toMap).toMap
+    beforeAndAfter.mapV(_.view.filterKeys(!commonElements(_)).toMap)
 
   lazy val (unchanged, changed) =
     commonElements.partition(k => beforeAndAfter(Before)(k) == beforeAndAfter(After)(k))
 
-  lazy val unchangedMap: Map[K,V] = beforeAndAfter(Before).filterKeys(unchanged).toMap
+  lazy val unchangedMap: Map[K,V] = beforeAndAfter(Before).view.filterKeys(unchanged).toMap
 
   lazy val changedMap: Map[K,Map[BeforeAndAfter, V]] =
-    changed.map(k => k -> beforeAndAfter.mapValues(_(k)).toMap).toMap
+    changed.map(k => k -> beforeAndAfter.mapV(_(k)).toMap).toMap
 
 }

scala-git/src/main/scala/com/madgag/diff/MapDiff.scala

@@ -24,9 +24,9 @@ object FileName {
   object ImplicitConversions {
     import language.implicitConversions
 
-    implicit def string2FileName(str: String) = FileName(str)
+    implicit def string2FileName(str: String): FileName = FileName(str)
 
-    implicit def filename2String(fileName: FileName) = fileName.string
+    implicit def filename2String(fileName: FileName): String = fileName.string
   }
 
   def apply(name: String): FileName = {