removed scala 2.12 and js

j-mie6 · Feb 8, 2024 · e910d81 · e910d81
1 parent 74b017f
commit e910d81
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13, 2.12, 3]
+        scala: [2.13, 3]
         java: [temurin@8]
-        project: [rootJS, rootJVM, rootNative]
+        project: [rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -63,10 +63,6 @@ jobs:
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
-      - name: scalaJSLink
-        if: matrix.project == 'rootJS'
-        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
-
       - name: nativeLink
         if: matrix.project == 'rootNative'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
@@ -84,11 +80,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
-        run: mkdir -p scalatest/jvm/target core/native/target core/js/target scalatest/native/target core/jvm/target scalatest/js/target project/target
+        run: mkdir -p scalatest/jvm/target core/native/target scalatest/native/target core/jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
-        run: tar cf targets.tar scalatest/jvm/target core/native/target core/js/target scalatest/native/target core/jvm/target scalatest/js/target project/target
+        run: tar cf targets.tar scalatest/jvm/target core/native/target scalatest/native/target core/jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
@@ -125,16 +121,6 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Download target directories (2.13, rootJS)
-        uses: actions/download-artifact@v4
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
-
-      - name: Inflate target directories (2.13, rootJS)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
       - name: Download target directories (2.13, rootJVM)
         uses: actions/download-artifact@v4
         with:
@@ -155,46 +141,6 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12, rootJS)
-        uses: actions/download-artifact@v4
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
-
-      - name: Inflate target directories (2.12, rootJS)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (2.12, rootJVM)
-        uses: actions/download-artifact@v4
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
-
-      - name: Inflate target directories (2.12, rootJVM)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (2.12, rootNative)
-        uses: actions/download-artifact@v4
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
-
-      - name: Inflate target directories (2.12, rootNative)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (3, rootJS)
-        uses: actions/download-artifact@v4
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
-
-      - name: Inflate target directories (3, rootJS)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
       - name: Download target directories (3, rootJVM)
         uses: actions/download-artifact@v4
         with:
@@ -269,7 +215,7 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_2.13 rootjs_2.12 rootjs_3 docs_2.13 docs_2.12 docs_3 rootjvm_2.13 rootjvm_2.12 rootjvm_3 rootnative_2.13 rootnative_2.12 rootnative_3
+          modules-ignore: rootjs_2.13 rootjs_3 docs_2.13 docs_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3
           configs-ignore: test scala-tool scala-doc-tool test-internal
 
   site:

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ inThisBuild(List(
     startYear := Some(2024),
     licenses := List("BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")),
 
-    crossScalaVersions := Seq(Scala213, Scala212, Scala3),
+    crossScalaVersions := Seq(Scala213, /*Scala212,*/ Scala3),
     scalaVersion := Scala213,
 
     tlCiReleaseBranches := Seq.empty, //Seq(mainBranch),
@@ -34,7 +34,7 @@ lazy val commonSettings = Seq(
     resolvers ++= Opts.resolver.sonatypeOssReleases,
 )
 
-lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+lazy val core = crossProject(JVMPlatform, NativePlatform)
     .withoutSuffixFor(JVMPlatform)
     .crossType(CrossType.Full)
     .in(file("core"))
@@ -43,7 +43,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
         commonSettings,
     )
 
-lazy val scalatest = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+lazy val scalatest = crossProject(JVMPlatform, NativePlatform)
     .withoutSuffixFor(JVMPlatform)
     .crossType(CrossType.Full)
     .dependsOn(core)
@@ -61,5 +61,5 @@ lazy val docs = project.in(file("site"))
     .settings(
         tlFatalWarnings := githubIsWorkflowBuild.value,
         tlSiteKeepFiles := false, // FIXME: disable
-        
+
     )
diff --git a/scalatest/shared/src/main/scala/test/golden/GoldenConfig.scala b/scalatest/shared/src/main/scala/test/golden/GoldenConfig.scala
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Golden Scala Contributors <https://github.com/j-mie6/golden-scala/graphs/contributors>
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 package test.golden.scalatest
 
 // this is probably core!

diff --git a/scalatest/shared/src/main/scala/test/golden/HasGoldenConfig.scala b/scalatest/shared/src/main/scala/test/golden/HasGoldenConfig.scala
@@ -5,7 +5,9 @@
  */
 package test.golden.scalatest
 
-import org.scalatest.{Args, Status, Suite}
+import org.scalatest.Args
+import org.scalatest.Status
+import org.scalatest.Suite
 
 trait HasGoldenConfig extends Suite {
     private [golden] var goldenConfig: GoldenConfig = GoldenConfig.default