Merge pull request #76 from eed3si9n/wip/bump

Update CI settings and package

Author: gemelen

.github/workflows/ci.yml

@@ -23,19 +23,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.14]
-        java: [adopt@1.8]
+        scala: [2.12.17]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -70,19 +72,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.14]
-        java: [adopt@1.8]
+        scala: [2.12.17]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -96,12 +100,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.14)
+      - name: Download target directories (2.12.17)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.14)
+      - name: Inflate target directories (2.12.17)
         run: |
           tar xf targets.tar
           rm targets.tar

.scalafmt.conf

@@ -0,0 +1,10 @@
+version = 2.0.0
+maxColumn = 120
+project.git = true
+
+# http://docs.scala-lang.org/style/scaladoc.html recommends the JavaDoc style.
+# scala/scala is written that way too https://github.com/scala/scala/blob/v2.12.2/src/library/scala/Predef.scala
+docstrings = JavaDoc
+
+# This also seems more idiomatic to include whitespace in import x.{ yyy }
+spaces.inImportCurlyBraces = true

README.md

@@ -45,7 +45,7 @@ Each of the files should have the following contents.
 
 `project/plugins.sbt`:
 
-     addSbtPlugin("com.typesafe.sbt" % "sbt-pom-reader" % "x.y.z")
+     addSbtPlugin("com.github.sbt" % "sbt-pom-reader" % "x.y.z")
 
 
 ## Configuring projects

build.sbt

@@ -1,8 +1,22 @@
-ThisBuild / organization := "com.typesafe.sbt"
+val mvnVersion = "3.8.2"
+val mvnResolverVersion = "1.7.2"
+val scala212 = "2.12.17"
+// val scala210 = "2.10.7"
+
+ThisBuild / organization := "com.github.sbt"
 ThisBuild / licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
 ThisBuild / developers := List(Developer("", "", "", url("https://github.com/sbt/sbt-pom-reader/graphs/contributors")))
 ThisBuild / homepage := Some(url("https://github.com/sbt/sbt-pom-reader"))
+ThisBuild / dynverSonatypeSnapshots := true
+ThisBuild / version := {
+  val orig = (ThisBuild / version).value
+  if (orig.endsWith("-SNAPSHOT")) "2.2.0-SNAPSHOT"
+  else orig
+}
+ThisBuild / scalaVersion := scala212
+ThisBuild / crossScalaVersions := Seq(scala212)
 
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))
 ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted")))
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
 ThisBuild / githubWorkflowPublish := Seq(
@@ -17,14 +31,10 @@ ThisBuild / githubWorkflowPublish := Seq(
   )
 )
 
-val mvnVersion = "3.8.2"
-val mvnResolverVersion = "1.7.2"
-
 lazy val root = (project in file("."))
   .enablePlugins(SbtPlugin)
   .settings(nocomma {
     name := "sbt-pom-reader"
-    pluginCrossBuild / sbtVersion := "1.2.8"
 
     libraryDependencies ++= Seq(
       "org.apache.maven" % "maven-embedder" % mvnVersion
@@ -46,4 +56,10 @@ lazy val root = (project in file("."))
     scriptedLaunchOpts := scriptedLaunchOpts.value ++ Seq("-Dproject.version=" + version.value)
     scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
     scriptedBufferLog := true
+    (pluginCrossBuild / sbtVersion) := {
+      scalaBinaryVersion.value match {
+        case "2.10" => "0.13.18"
+        case "2.12" => "1.2.8"
+      }
+    }
   })

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.9.0-RC2

project/plugins.sbt

@@ -1,3 +1,4 @@
-addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
+addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")