Merge pull request #53 from tulz-app/feature/unapply

add decompose to Composition
tulz-app · Dec 13, 2022 · 8936805 · 8936805
2 parents 45d7a1b + 3a6ef71
commit 8936805
Show file tree

Hide file tree

Showing 16 changed files with 4,872 additions and 1,926 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.2.0, 2.13.6, 2.12.14]
+        scala: [3.2.1, 2.13.10, 2.12.17]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -61,7 +61,7 @@ jobs:
       - name: Build project
         run: sbt ++${{ matrix.scala }} test
 
-      - run: sbt ++${{ matrix.scala }} versionPolicyCheck
+      - run: sbt ++${{ matrix.scala }} versionPolicyCheck test
 
       - name: Compress target directories
         run: tar cf targets.tar modules/apply/.js/target target modules/apply/.jvm/target modules/full/.js/target modules/full/.jvm/target modules/basic/.js/target modules/basic-light/.jvm/target modules/basic/.jvm/target modules/full-light/.js/target modules/basic-light/.js/target modules/full-light/.jvm/target project/target
@@ -79,7 +79,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6]
+        scala: [2.13.10]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -107,32 +107,32 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.2.0)
+      - name: Download target directories (3.2.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.2.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3.2.0)
+      - name: Inflate target directories (3.2.1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.6)
+      - name: Download target directories (2.13.10)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.6)
+      - name: Inflate target directories (2.13.10)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - 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

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,10 @@
 version=3.6.1
+runner.dialect = "scala213"
+fileOverride {
+  "glob:**/scala-3/**" {
+    runner.dialect = scala3
+  }
+}
 style = defaultWithAlign
 align.openParenCallSite = true
 align.openParenDefnSite = true

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,5 @@
 import sbt.librarymanagement.CrossVersion
+import com.typesafe.tools.mima.core._
 
 inThisBuild(
   List(
@@ -16,9 +17,13 @@ inThisBuild(
     ),
     ThisBuild / versionScheme := Some("early-semver"),
     versionPolicyIntention    := Compatibility.BinaryCompatible,
+    mimaBinaryIssueFilters ++= Seq(
+      ProblemFilters.exclude[DirectMissingMethodProblem]("app.tulz.tuplez.Composition.apply"),
+      ProblemFilters.exclude[ReversedMissingMethodProblem]("app.tulz.tuplez.Composition.decompose"),
+    ),
     githubWorkflowTargetTags ++= Seq("v*"),
     githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
-    githubWorkflowBuild ++= Seq(WorkflowStep.Sbt(List("versionPolicyCheck"))),
+    githubWorkflowBuild ++= Seq(WorkflowStep.Sbt(List("versionPolicyCheck", "test"))),
     githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("ci-release"))),
     githubWorkflowEnv ~= (_ ++ Map(
       "PGP_PASSPHRASE"    -> s"$${{ secrets.PGP_PASSPHRASE }}",
@@ -34,6 +39,7 @@ lazy val `tuplez-full` =
     .crossType(CrossType.Pure)
     .in(file("modules/full"))
     .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+    .settings(ScalaOptions.fixOptions)
     .settings(commonSettings)
     .jsSettings(commonJsSettings)
     .settings(
@@ -56,6 +62,7 @@ lazy val `tuplez-full-light` =
     .crossType(CrossType.Pure)
     .in(file("modules/full-light"))
     .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+    .settings(ScalaOptions.fixOptions)
     .settings(commonSettings)
     .jsSettings(commonJsSettings)
     .settings(
@@ -78,6 +85,7 @@ lazy val `tuplez-basic` =
     .crossType(CrossType.Pure)
     .in(file("modules/basic"))
     .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+    .settings(ScalaOptions.fixOptions)
     .settings(commonSettings)
     .jsSettings(commonJsSettings)
     .settings(
@@ -100,6 +108,7 @@ lazy val `tuplez-basic-light` =
     .crossType(CrossType.Pure)
     .in(file("modules/basic-light"))
     .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+    .settings(ScalaOptions.fixOptions)
     .settings(commonSettings)
     .jsSettings(commonJsSettings)
     .settings(
@@ -122,6 +131,7 @@ lazy val `tuplez-apply` =
     .crossType(CrossType.Pure)
     .in(file("modules/apply"))
     .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+    .settings(ScalaOptions.fixOptions)
     .settings(commonSettings)
     .jsSettings(commonJsSettings)
     .settings(
@@ -144,7 +154,9 @@ lazy val commonSettings = Seq(
   libraryDependencies ++= Seq(
     "junit"           % "junit"           % "4.13.2" % Test,
     ("com.github.sbt" % "junit-interface" % "0.13.3" % Test).exclude("junit", "junit-dep")
-  )
+  ),
+  scalacOptions := scalacOptions.value.filterNot(_ == "-Wdead-code"),
+//  scalacOptions := scalacOptions.value.filterNot(_ == "-Xfatal-warnings")
 )
 
 lazy val commonJsSettings = Seq(