Merge pull request #458 from gemini-hlsw/topic/sbt-typelevel-updates

Changes for latest sbt-typelevel
typelevel · Aug 25, 2023 · 83e0185 · 83e0185
2 parents 8804d1f + 08a7f9b
commit 83e0185
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         os: [ubuntu-latest]
         scala: [2.13, 3]
         java: [temurin@11]
-        project: [gsp-graphqlJS, gsp-graphqlJVM, gsp-graphqlNative]
+        project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -58,12 +58,16 @@ jobs:
       - name: Check Headers
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll
 
+      - name: Check headers
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll
+
       - name: scalaJSLink
-        if: matrix.project == 'gsp-graphqlJS'
+        if: matrix.project == 'rootJS'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
 
       - name: nativeLink
-        if: matrix.project == 'gsp-graphqlNative'
+        if: matrix.project == 'rootNative'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
 
       - name: Test
@@ -120,62 +124,62 @@ jobs:
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Download target directories (2.13, gsp-graphqlJS)
+      - name: Download target directories (2.13, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-gsp-graphqlJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
 
-      - name: Inflate target directories (2.13, gsp-graphqlJS)
+      - name: Inflate target directories (2.13, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13, gsp-graphqlJVM)
+      - name: Download target directories (2.13, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-gsp-graphqlJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
 
-      - name: Inflate target directories (2.13, gsp-graphqlJVM)
+      - name: Inflate target directories (2.13, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13, gsp-graphqlNative)
+      - name: Download target directories (2.13, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-gsp-graphqlNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
 
-      - name: Inflate target directories (2.13, gsp-graphqlNative)
+      - name: Inflate target directories (2.13, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, gsp-graphqlJS)
+      - name: Download target directories (3, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-gsp-graphqlJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
 
-      - name: Inflate target directories (3, gsp-graphqlJS)
+      - name: Inflate target directories (3, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, gsp-graphqlJVM)
+      - name: Download target directories (3, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-gsp-graphqlJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
 
-      - name: Inflate target directories (3, gsp-graphqlJVM)
+      - name: Inflate target directories (3, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, gsp-graphqlNative)
+      - name: Download target directories (3, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-gsp-graphqlNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
 
-      - name: Inflate target directories (3, gsp-graphqlNative)
+      - name: Inflate target directories (3, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -234,5 +238,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: gsp-graphql-demo_2.13 gsp-graphql-demo_3 benchmarks_2.13 benchmarks_3 gsp-graphqljs_2.13 gsp-graphqljs_3 gsp-graphqljvm_2.13 gsp-graphqljvm_3 buildinfo_native0.4_2.13 buildinfo_native0.4_3 buildinfo_sjs1_2.13 buildinfo_sjs1_3 profile_2.13 profile_3 buildinfo_2.13 buildinfo_3 gsp-graphqlnative_2.13 gsp-graphqlnative_3
+          modules-ignore: gsp-graphql-demo_2.13 gsp-graphql-demo_3 benchmarks_2.13 benchmarks_3 rootjs_2.13 rootjs_3 buildinfo_native0.4_2.13 buildinfo_native0.4_3 buildinfo_sjs1_2.13 buildinfo_sjs1_3 profile_2.13 profile_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 buildinfo_2.13 buildinfo_3
           configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/build.sbt b/build.sbt
@@ -34,12 +34,13 @@ ThisBuild / tlBaseVersion    := "0.14"
 ThisBuild / organization     := "edu.gemini"
 ThisBuild / organizationName := "Association of Universities for Research in Astronomy, Inc. (AURA)"
 ThisBuild / startYear        := Some(2019)
-ThisBuild / licenses         += (("BSD-3-Clause", new URL("https://opensource.org/licenses/BSD-3-Clause")))
+ThisBuild / licenses         := Seq(("BSD-3-Clause", new URL("https://opensource.org/licenses/BSD-3-Clause")))
 ThisBuild / developers       := List(
   Developer("milessabin", "Miles Sabin", "[email protected]", url("http://milessabin.com/blog")),
   Developer("tpolecat",   "Rob Norris",  "[email protected]",   url("http://www.tpolecat.org")),
 )
 
+ThisBuild / tlCiScalafmtCheck       := false
 ThisBuild / tlCiReleaseBranches     := Seq("main")
 ThisBuild / tlSonatypeUseLegacyHost := false
 ThisBuild / githubWorkflowBuild     ~= { steps =>
@@ -49,6 +50,7 @@ ThisBuild / githubWorkflowBuild     ~= { steps =>
   ) +: steps
 }
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
+ThisBuild / tlBspCrossProjectPlatforms := Set(JVMPlatform)
 
 lazy val commonSettings = Seq(
   //scalacOptions --= Seq("-Wunused:params", "-Wunused:imports", "-Wunused:patvars", "-Wdead-code", "-Wunused:locals", "-Wunused:privates", "-Wunused:implicits"),
@@ -91,7 +93,7 @@ lazy val modules: List[CompositeProject] = List(
   profile
 )
 
-lazy val `gsp-graphql` = tlCrossRootProject
+lazy val root = tlCrossRootProject
   .aggregate(modules:_*)
   .disablePlugins(RevolverPlugin)
   .settings(

diff --git a/modules/sql/shared/src/test/scala/SqlComposedWorldSuite.scala b/modules/sql/shared/src/test/scala/SqlComposedWorldSuite.scala
@@ -129,7 +129,6 @@ trait SqlComposedWorldSuite extends CatsEffectSuite {
     val prg =
       (for {
         cm  <- mapping
-        c   =  cm._1
         m   =  cm._2
         n0  <- cm._1.count
         res <- m.compileAndRun(query)

diff --git a/modules/sql/shared/src/test/scala/SqlNestedEffectsSuite.scala b/modules/sql/shared/src/test/scala/SqlNestedEffectsSuite.scala
@@ -162,7 +162,6 @@ trait SqlNestedEffectsSuite extends CatsEffectSuite {
     val prg =
       (for {
         cm  <- mapping
-        c   =  cm._1
         m   =  cm._2
         n0  <- cm._1.count
         res <- m.compileAndRun(query)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,13 +1,8 @@
-addSbtPlugin("org.typelevel"             % "sbt-typelevel-ci-release"      % "0.5.0")
+addSbtPlugin("org.typelevel"             % "sbt-typelevel"                 % "0.5.0")
 addSbtPlugin("io.spray"                  % "sbt-revolver"                  % "0.10.0")
 addSbtPlugin("com.github.sbt"            % "sbt-site-paradox"              % "1.5.0")
 addSbtPlugin("com.timushev.sbt"          % "sbt-updates"                   % "0.6.4")
 addSbtPlugin("de.heikoseeberger"         % "sbt-header"                    % "5.10.0")
-addSbtPlugin("org.typelevel" % "sbt-tpolecat"                  % "0.5.0")
 addSbtPlugin("pl.project13.scala"        % "sbt-jmh"                       % "0.4.5")
 addSbtPlugin("nl.zolotko.sbt"            % "sbt-jfr"                       % "0.0.1")
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"                   % "1.13.2")
-addSbtPlugin("org.portable-scala"        % "sbt-scalajs-crossproject"      % "1.3.2")
-addSbtPlugin("org.scala-native"          % "sbt-scala-native"              % "0.4.14")
-addSbtPlugin("org.portable-scala"        % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"                 % "0.11.0")