Merge branch 'softwaremill:master' into master

Author: dabd

.github/workflows/main.yaml

@@ -2,49 +2,92 @@ name: CI
 
 on:
   push:
-    branches: [ "**" ]
-    tags: [ v* ]
+    branches: ["**"]
+    tags: [v*]
   pull_request:
-    branches: [ "**" ]
-
+    branches: ["**"]
+env:
+  # .sbtopts specifies 8g, which is needed to import into IntelliJ, but on GH that exceeds the maximum available memory
+  SBT_JAVA_OPTS: -J-Xms4g -J-Xmx4g
 jobs:
   build:
-    runs-on: ubuntu-20.04
-    env:
-      JAVA_OPTS: -Xmx4G
+    # run on external PRs, but not on internal PRs since those will be run by push to branch
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        scala-version: ["2.12", "2.13", "3"]
+        target-platform: ["JVM", "JS"]
     steps:
       - uses: actions/[email protected]
       - uses: coursier/[email protected]
-      - uses: coursier/[email protected]
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          jvm: zulu:17
-      - name: Run tests with sbt
-        run: sbt test
+          distribution: "temurin"
+          cache: "sbt"
+          java-version: 11
+      - uses: coursier/[email protected]
+      - name: Compile
+        run: sbt $SBT_JAVA_OPTS -v "compileScoped ${{ matrix.scala-version }} ${{ matrix.target-platform }}"
       - name: Compile docs
+        if: matrix.target-platform == 'JVM'
         run: sbt compileDocs
+      - name: Test
+        run: sbt $SBT_JAVA_OPTS -v "testScoped ${{ matrix.scala-version }} ${{ matrix.target-platform }}"
       - name: Generate LSIF
+        if: matrix.target-platform == 'JVM' && matrix.scala-version == 2.13
         run: cs launch com.sourcegraph:scip-java_2.13:0.8.2 -- index
       - name: Install sourcegraph/src
+        if: matrix.target-platform == 'JVM' && matrix.scala-version == 2.13
+
         run: yarn global add @sourcegraph/src
       - name: Upload LSIF data
+        if: matrix.target-platform == 'JVM' && matrix.scala-version == 2.13
+
         run: src code-intel upload -trace=3 -root . -file index.scip -github-token $GITHUB_TOKEN
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  mima:
+    # run on external PRs, but not on internal PRs since those will be run by push to branch
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # checkout tags so that dynver works properly (we need the version for MiMa)
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 11
+          cache: "sbt"
+      - name: Check MiMa
+        run: sbt $SBT_JAVA_OPTS -v mimaReportBinaryIssues
+
   publish:
     name: Publish release
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
     needs: [build]
-    runs-on: ubuntu-20.04
-    env:
-      JAVA_OPTS: -Xmx4G
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 0
       - uses: coursier/[email protected]
-      - uses: olafurpg/setup-scala@v14
-      - run: sbt ci-release
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 11
+          cache: "sbt"
+      - name: Compile
+        run: sbt $SBT_JAVA_OPTS compile
+      - name: Publish artifacts
+        run: sbt $SBT_JAVA_OPTS ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -66,5 +109,3 @@ jobs:
           version: "v${{ env.VERSION }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-

.sbtopts

@@ -0,0 +1,3 @@
+-J-Xmx8G
+-J-Xss2M
+-Dsbt.task.timings=false

README.md

@@ -1,6 +1,6 @@
 ![diffx](https://github.com/softwaremill/diffx/raw/master/banner.png)
 
-[![Build Status](https://img.shields.io/github/workflow/status/softwaremill/diffx/CI/master)](https://github.com/softwaremill/diffx/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/softwaremill/diffx/main.yaml?branch=master)](https://github.com/softwaremill/diffx/actions)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.softwaremill.diffx/diffx-core_2.13/badge.svg)](https://search.maven.org/search?q=g:com.softwaremill.diffx)
 [![diffx-core Scala version support](https://index.scala-lang.org/softwaremill/diffx/diffx-core/latest-by-scala-version.svg)](https://index.scala-lang.org/softwaremill/diffx/diffx-core)
 

build.sbt

@@ -3,6 +3,7 @@ import sbt.Def
 import sbt.Reference.display
 import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
 import com.softwaremill.Publish.{ossPublishSettings, updateDocs}
+import complete.DefaultParsers._
 
 val scala212 = "2.12.16"
 val scala213 = "2.13.8"
@@ -14,10 +15,19 @@ val scalatestVersion = "3.2.12"
 val specs2Version = "4.16.1"
 val smlTaggingVersion = "2.3.3"
 
+val scopesDescription = "Scala version can be: 2.12, 2.13, 3; platform: JVM, JS, Native"
+val compileScoped =
+  inputKey[Unit](
+    s"Compiles sources in the given scope. Usage: compileScoped [scala version] [platform]. $scopesDescription"
+  )
+val testScoped =
+  inputKey[Unit](s"Run tests in the given scope. Usage: testScoped [scala version] [platform]. $scopesDescription")
+
 lazy val commonSettings: Seq[Def.Setting[_]] = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   organization := "com.softwaremill.diffx",
   scmInfo := Some(ScmInfo(url("https://github.com/softwaremill/diffx"), "[email protected]:softwaremill/diffx.git")),
   ideSkipProject := (scalaVersion.value != scalaIdeaVersion) || thisProjectRef.value.project.contains("JS"),
+  mimaPreviousArtifacts := Set.empty, // we only use MiMa for `core` for now, using enableMimaSettings
   updateDocs := Def.taskDyn {
     val files1 = UpdateVersionInDocs(sLog.value, organization.value, version.value)
     Def.task {
@@ -32,6 +42,16 @@ compileDocs := {
   (docs.jvm(scala213) / mdoc).toTask(" --out target/diffx-docs").value
 }
 
+val versioningSchemeSettings = Seq(versionScheme := Some("early-semver"))
+
+val enableMimaSettings = Seq(
+  mimaPreviousArtifacts := {
+    val previous = previousStableVersion.value
+    println(s"[info] Not a M or RC version, using previous version for MiMa check: $previous")
+    previous.map(organization.value %% moduleName.value % _).toSet
+  }
+)
+
 val versionSpecificScalaSources = {
   Compile / unmanagedSourceDirectories := {
     val current = (Compile / unmanagedSourceDirectories).value
@@ -50,6 +70,7 @@ val versionSpecificScalaSources = {
 
 lazy val core = (projectMatrix in file("core"))
   .settings(commonSettings)
+  .settings(versioningSchemeSettings)
   .settings(
     name := "diffx-core",
     libraryDependencies ++= {
@@ -74,7 +95,8 @@ lazy val core = (projectMatrix in file("core"))
     versionSpecificScalaSources
   )
   .jvmPlatform(
-    scalaVersions = List(scala212, scala213, scala3)
+    scalaVersions = List(scala212, scala213, scala3),
+      settings = enableMimaSettings
   )
   .jsPlatform(
     scalaVersions = List(scala212, scala213, scala3),
@@ -289,6 +311,19 @@ val allAggregates =
 def filterProject(p: String => Boolean) =
   ScopeFilter(inProjects(allAggregates.filter(pr => p(display(pr.project))): _*))
 
+def filterByVersionAndPlatform(scalaVersionFilter: String, platformFilter: String) = filterProject { projectName =>
+  val byPlatform =
+    if (platformFilter == "JVM") !projectName.contains("JS") && !projectName.contains("Native")
+    else projectName.contains(platformFilter)
+  val byVersion = scalaVersionFilter match {
+    case "2.13" => !projectName.contains("2_12") && !projectName.contains("3")
+    case "2.12" => projectName.contains("2_12")
+    case "3"    => projectName.contains("3")
+  }
+
+  byPlatform && byVersion && !projectName.contains("finatra")
+}
+
 lazy val rootProject = project
   .in(file("."))
   .settings(commonSettings)
@@ -297,6 +332,14 @@ lazy val rootProject = project
     name := "diffx",
     scalaVersion := scalaIdeaVersion,
     testJVM := (Test / test).all(filterProject(p => !p.contains("JS") && !p.contains("Native"))).value,
-    testJS := (Test / test).all(filterProject(_.contains("JS"))).value
+    testJS := (Test / test).all(filterProject(_.contains("JS"))).value,
+    compileScoped := Def.inputTaskDyn {
+      val args = spaceDelimited("<arg>").parsed
+      Def.taskDyn((Compile / compile).all(filterByVersionAndPlatform(args.head, args(1))))
+    }.evaluated,
+    testScoped := Def.inputTaskDyn {
+      val args = spaceDelimited("<arg>").parsed
+      Def.taskDyn((Test / test).all(filterByVersionAndPlatform(args.head, args(1))))
+    }.evaluated
   )
   .aggregate(allAggregates: _*)

project/plugins.sbt

@@ -2,8 +2,9 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % "
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % "2.0.9")
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-extra" % "2.0.9")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
 
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")