Merge pull request #43 from mkurz/upgrade

Upgrade to latest sbt-web, use GHA/sbt-ci-release

.github/workflows/build-test.yml

@@ -0,0 +1,30 @@
+name: Check
+
+on:
+  pull_request:
+
+  push:
+    branches:
+      - main # Check branch after merge
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    name: Tests
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    with:
+      java: 17, 11, 8
+      scala: 2.12.18
+      cmd: |
+        sbt ++$MATRIX_SCALA test ^scripted
+
+  finish:
+    name: Finish
+    if: github.event_name == 'pull_request'
+    needs: # Should be last
+      - "tests"
+    uses: playframework/.github/.github/workflows/rtm.yml@v3

.github/workflows/publish.yml

@@ -0,0 +1,44 @@
+name: Publish
+
+on:
+  push:
+    branches: # Snapshots
+      - main
+    tags: ["**"] # Releases
+
+jobs:
+  publish-artifacts:
+    name: JDK 8
+    runs-on: ubuntu-20.04
+    if: ${{ github.repository_owner == 'sbt' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-depth: 0
+
+      - name: Coursier Cache
+        id: coursier-cache
+        uses: coursier/cache-action@v6
+
+      - name: Install Adoptium Temurin OpenJDK
+        uses: coursier/setup-action@v1
+        with:
+          jvm: adoptium:8
+
+      - name: Publish artifacts
+        run: sbt ci-release
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+
+      - name: Cleanup before cache
+        shell: bash
+        run: |
+          find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+          find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+          find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+          find $HOME/.sbt                              -name "*.lock"               -delete || true

.gitignore

@@ -1,3 +1,4 @@
 .idea
 .idea_modules
 target
+.bsp/

README.md

@@ -1,14 +1,14 @@
 sbt-concat
 ==========
-[![Build Status](https://api.travis-ci.org/sbt/sbt-concat.png?branch=master)](https://travis-ci.org/sbt/sbt-concat) [![Download](https://api.bintray.com/packages/sbt-web/sbt-plugin-releases/sbt-concat/images/download.svg)](https://bintray.com/sbt-web/sbt-plugin-releases/sbt-concat/_latestVersion)
+[![Build Status](https://github.com/sbt/sbt-concat/actions/workflows/build-test.yml/badge.svg)](https://github.com/sbt/sbt-concat/actions/workflows/build-test.yml)
 
 [sbt-web] plugin for concatenating files together, using the sbt-web asset pipeline.
 
 Plugin
 ======
 Add the plugin to your `project/plugins.sbt`:
 ```scala
-addSbtPlugin("net.ground5hark.sbt" % "sbt-concat" % "0.2.0")
+addSbtPlugin("com.github.sbt" % "sbt-concat" % "1.0.0")
 ```
 
 Enable the [sbt-web] plugin for your project:

build.sbt

@@ -1,10 +1,28 @@
 lazy val `sbt-concat` = project in file(".")
 
-organization := "net.ground5hark.sbt"
-name := "sbt-concat"
+enablePlugins(SbtWebBase)
+
+sonatypeProfileName := "com.github.sbt.sbt-concat" // See https://issues.sonatype.org/browse/OSSRH-77819#comment-1203625
+
 description := "sbt-web asset concatenation plugin"
 
-enablePlugins(SbtWebBase)
-addSbtWeb("1.4.3")
+developers += Developer(
+  "playframework",
+  "The Play Framework Team",
+  "[email protected]",
+  url("https://github.com/playframework")
+)
+
+addSbtWeb("1.5.3")
 
 licenses := Seq("MIT" -> url("https://opensource.org/licenses/mit-license.php"))
+
+// Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
+ThisBuild / dynverVTagPrefix := false
+
+// Sanity-check: assert that version comes from a tag (e.g. not a too-shallow clone)
+// https://github.com/dwijnand/sbt-dynver/#sanity-checking-the-version
+Global / onLoad := (Global / onLoad).value.andThen { s =>
+  dynverAssertTagVersion.value
+  s
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.9.7

project/plugins.sbt

@@ -1,2 +1,3 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-web-build-base" % "1.2.1")
+addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.0.2")
 
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

src/main/scala/net/ground5hark/sbt/concat/SbtConcat.scala

@@ -42,7 +42,7 @@ object SbtConcat extends AutoPlugin {
 
   override def projectSettings = Seq(
     groups := ListBuffer.empty[ConcatGroup],
-    includeFilter in concat := NotHiddenFileFilter,
+    concat / includeFilter := NotHiddenFileFilter,
     parentDir := "",
     concat := concatFiles.value
   )
@@ -64,15 +64,15 @@ object SbtConcat extends AutoPlugin {
     val logValue = streams.value.log
     mappings: Seq[PathMapping] =>
       val groupsValue = toFileNames(groups.value,
-        (sourceDirectories in Assets).value,
-        (webModuleDirectories in Assets).value)
+        (Assets / sourceDirectories).value,
+        (Assets / webModuleDirectories).value)
 
       val groupMappings = if (groupsValue.nonEmpty) {
         logValue.info(s"Building ${groupsValue.size} concat group(s)")
         // Mutable map so we can pop entries we've already seen, in case there are similarly named files
         val reverseMapping = ReverseGroupMapping.get(groupsValue, logValue)
         val concatGroups = mutable.Map.empty[String, StringBuilder]
-        val filteredMappings = mappings.filter(m => (includeFilter in concat).value.accept(m._1) && m._1.isFile)
+        val filteredMappings = mappings.filter(m => (concat / includeFilter).value.accept(m._1) && m._1.isFile)
         val targetDir = webTarget.value / parentDir.value
 
         groupsValue.foreach {

src/sbt-test/sbt-concat/simple/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("net.ground5hark.sbt" %% "sbt-concat" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" %% "sbt-concat" % sys.props("project.version"))