Merge pull request #36 from eed3si9n/wip/split

Split Ant and Maven plugins out

.github/workflows/ci.yml

@@ -15,19 +15,30 @@ jobs:
           - os: ubuntu-latest
             java: 11
             jobtype: 1
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 2
     runs-on: ${{ matrix.os }}
     env:
       # define Java options for both official sbt and sbt-extras
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup
-      uses: olafurpg/setup-scala@v13
+      uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: "adopt@1.${{ matrix.java }}"
-    - name: Coursier cache
-      uses: coursier/cache-action@v6
-    - name: Build and test
-      run: sbt -v "scalafmtCheckAll" "jarjar/publishLocal" "jarjar/IntegrationTest/test" "+test" "publishLocal;scripted"
+        distribution: temurin
+        java-version: "${{ matrix.java }}"
+        cache: sbt
+    - name: Build and test (1)
+      if: ${{ matrix.jobtype == 1 }}
+      shell: bash
+      run: |
+        sbt -v -Dfile.encoding=UTF8 "jarjar/publishLocal" "jarjar/IntegrationTest/test" "+test" "publishLocal;scripted"
+    - name: Build and test (2)
+      if: ${{ matrix.jobtype == 2 }}
+      shell: bash
+      run: |
+        sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll

build.sbt

@@ -4,7 +4,11 @@ ThisBuild / scalaVersion := scala212
 ThisBuild / organization := "com.eed3si9n.jarjarabrams"
 ThisBuild / organizationName := "eed3si9n"
 ThisBuild / organizationHomepage := Some(url("http://eed3si9n.com/"))
-ThisBuild / version := "1.8.2-SNAPSHOT"
+ThisBuild / version := {
+  val old = (ThisBuild / version).value
+  if ((ThisBuild / isSnapshot).value) "1.9.0-SNAPSHOT"
+  else old
+}
 ThisBuild / description := "utility to shade Scala libraries"
 ThisBuild / licenses := Seq(
   "Apache 2" -> new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")
@@ -25,8 +29,6 @@ lazy val jarjar = project
     libraryDependencies ++= Seq(
       "org.ow2.asm" % "asm" % "9.5",
       "org.ow2.asm" % "asm-commons" % "9.5",
-      "org.apache.ant" % "ant" % "1.10.14",
-      "org.apache.maven" % "maven-plugin-api" % "3.9.4",
       "org.apache.commons" % "commons-lang3" % "3.8.1",
       "junit" % "junit" % "4.12" % "it,test",
       "com.github.sbt" % "junit-interface" % "0.13.2" % "it,test"
@@ -52,6 +54,36 @@ lazy val jarjar = project
     }
   })
 
+lazy val ant_jarjar = project
+  .in(file("ant-jarjar"))
+  .disablePlugins(ScalafmtPlugin)
+  .dependsOn(jarjar)
+  .settings(nocomma {
+    organization := "com.eed3si9n.jarjar"
+    name := "ant-jarjar"
+    crossScalaVersions := Vector(scala212)
+    crossPaths := false
+    autoScalaLibrary := false
+    libraryDependencies ++= Seq(
+      "org.apache.ant" % "ant" % "1.10.14",
+    )
+  })
+
+lazy val maven_jarjar = project
+  .in(file("maven-jarjar"))
+  .disablePlugins(ScalafmtPlugin)
+  .dependsOn(jarjar)
+  .settings(nocomma {
+    organization := "com.eed3si9n.jarjar"
+    name := "maven-jarjar"
+    crossScalaVersions := Vector(scala212)
+    crossPaths := false
+    autoScalaLibrary := false
+    libraryDependencies ++= Seq(
+      "org.apache.maven" % "maven-plugin-api" % "3.9.4",
+    )
+  })
+
 lazy val jarjar_assembly = project
   .settings(nocomma {
     organization := "com.eed3si9n.jarjar"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.9.6

project/plugins.sbt

@@ -1,5 +1,8 @@
-addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.0")
+ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+
+addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.6")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")