Updates to support 2.13. CI build.

Author: miguelbranco80

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  pull_request:
+    paths:
+      - .github/workflows/ci.yaml
+      - .sbtopts
+      - build.sbt
+      - .scalafmt.conf
+      - project/**
+      - src/**
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  GITHUB_TOKEN: ${{ secrets.READ_PACKAGES }}
+
+jobs:
+  code-check:
+    runs-on: self-hosted
+    container:
+      image: sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.2_13_1.9.9_2.12.19
+    steps:
+      - uses: actions/checkout@v4
+      - run: sbt headerCheckAll
+  test:
+    runs-on: self-hosted
+    container:
+      image: sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.2_13_1.9.9_2.12.19
+    steps:
+      - uses: actions/checkout@v4
+      - run: sbt clean test

.github/workflows/publish.yaml

@@ -0,0 +1,22 @@
+name: publish
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+env:
+  GITHUB_TOKEN: ${{ secrets.WRITE_PACKAGES }}
+
+jobs:
+  publish:
+    runs-on: self-hosted
+    container:
+      image: sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.2_13_1.9.9_2.12.19
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: sbt publish
+      run: |
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        sbt clean publish

README.md

@@ -20,7 +20,7 @@ It will patch the JAR name in the JAR file itself, so that the automatic module
 
 ## Usage
 
-This plugin currently supports only Scala 2.12.
+This plugin currently supports only Scala 2.12 and 2.13.
 
 Add the plugin to your `project/plugins.sbt` file:
 

build.sbt

@@ -10,8 +10,8 @@ organizationName := "RAW Labs SA"
 
 organizationHomepage := Some(url("https://www.raw-labs.com/"))
 
-version := "0.0.1"
-
 scalaVersion := "2.12.18"
 
 publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true)
+
+publishTo := Some("GitHub raw-labs Apache Maven Packages" at "https://maven.pkg.github.com/raw-labs/sbt-module-patcher")

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")

src/main/scala/SbtModulePatcher.scala

@@ -1,10 +1,10 @@
-import sbt.*
-import sbt.Keys.*
+import sbt._
+import sbt.Keys._
 
-import java.io.*
-import java.nio.file.*
-import java.util.jar.*
-import scala.collection.JavaConverters.*
+import java.io._
+import java.nio.file._
+import java.util.jar._
+import scala.collection.JavaConverters._
 import java.security.MessageDigest
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption.{CREATE, WRITE}
@@ -33,10 +33,7 @@ object SbtModulePatcher extends AutoPlugin {
           val jarFiles =
             classpath.map(_.data).filter(_.getName.endsWith(".jar"))
 
-          log.info("Test if it runs")
-
           jarFiles.foreach { jarFile =>
-            log.info(s"Checking file ${jarFile.getName}")
             if (!isModule(jarFile, log)) {
               modifyJar(jarFile, log)
               updateChecksums(jarFile, log)
@@ -57,17 +54,19 @@ object SbtModulePatcher extends AutoPlugin {
   )
 
   private def isModule(jarFile: File, log: Logger): Boolean = {
-    if (!jarFile.getName.contains("_2.12")) {
+    // Support both Scala 2.12 and 2.13
+    if (!jarFile.getName.contains("_2.12") && !jarFile.getName.contains("_2.13")) {
       return true
     }
+    log.debug(s"Analyzing file ${jarFile.getName}...")
 
     val jar = new JarFile(jarFile)
     val entries = jar.entries().asScala
 
     // Check if module-info.class exists
     if (entries.exists(_.getName == "module-info.class")) {
       jar.close()
-      log.info(
+      log.debug(
         s"JAR file ${jarFile.getName} is already a module (module-info.class found)")
       return true
     }
@@ -91,6 +90,8 @@ object SbtModulePatcher extends AutoPlugin {
       return true
     }
 
+    log.debug("File ${jarFile.getName} is not module-friendly, so patching is needed.")
+
     jar.close()
     false
   }
@@ -112,8 +113,13 @@ object SbtModulePatcher extends AutoPlugin {
     } else {
       new Manifest()
     }
+    // Support both 2.12 or 2.13
+    var idx = jarFile.getName.indexOf("_2.12")
+    if (idx == -1) {
+      idx = jarFile.getName.indexOf("_2.13")
+    }
     val moduleName = jarFile.getName
-      .substring(0, jarFile.getName.indexOf("_2.12"))
+      .substring(0, idx)
       .replaceAll("-", ".")
       .replaceAll("_", ".")
     val attrs = manifestOut.getMainAttributes