Merge pull request #463 from danicheg/fix-root-module-name

Fix root module name
typelevel · Sep 5, 2024 · 5752bf7 · 5752bf7
2 parents 09f8de0 + 17b0d03
commit 5752bf7
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         os: [ubuntu-latest]
         scala: [2.12, 2.13, 3]
         java: [temurin@8]
-        project: [rootJS, rootJVM, rootNative]
+        project: [disciplineNative, disciplineJS, disciplineJVM]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -63,14 +63,14 @@ jobs:
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
-      - name: scalaJSLink
-        if: matrix.project == 'rootJS'
-        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
-
       - name: nativeLink
-        if: matrix.project == 'rootNative'
+        if: matrix.project == 'disciplineNative'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
 
+      - name: scalaJSLink
+        if: matrix.project == 'disciplineJS'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
+
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
@@ -129,92 +129,92 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Download target directories (2.12, rootJS)
+      - name: Download target directories (2.12, disciplineNative)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineNative
 
-      - name: Inflate target directories (2.12, rootJS)
+      - name: Inflate target directories (2.12, disciplineNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12, rootJVM)
+      - name: Download target directories (2.12, disciplineJS)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJS
 
-      - name: Inflate target directories (2.12, rootJVM)
+      - name: Inflate target directories (2.12, disciplineJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12, rootNative)
+      - name: Download target directories (2.12, disciplineJVM)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJVM
 
-      - name: Inflate target directories (2.12, rootNative)
+      - name: Inflate target directories (2.12, disciplineJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13, rootJS)
+      - name: Download target directories (2.13, disciplineNative)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineNative
 
-      - name: Inflate target directories (2.13, rootJS)
+      - name: Inflate target directories (2.13, disciplineNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13, rootJVM)
+      - name: Download target directories (2.13, disciplineJS)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJS
 
-      - name: Inflate target directories (2.13, rootJVM)
+      - name: Inflate target directories (2.13, disciplineJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13, rootNative)
+      - name: Download target directories (2.13, disciplineJVM)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJVM
 
-      - name: Inflate target directories (2.13, rootNative)
+      - name: Inflate target directories (2.13, disciplineJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, rootJS)
+      - name: Download target directories (3, disciplineNative)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineNative
 
-      - name: Inflate target directories (3, rootJS)
+      - name: Inflate target directories (3, disciplineNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, rootJVM)
+      - name: Download target directories (3, disciplineJS)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJS
 
-      - name: Inflate target directories (3, rootJVM)
+      - name: Inflate target directories (3, disciplineJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3, rootNative)
+      - name: Download target directories (3, disciplineJVM)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJVM
 
-      - name: Inflate target directories (3, rootNative)
+      - name: Inflate target directories (3, disciplineJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -277,5 +277,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: discipline_2.12 discipline_2.13 discipline_3 discipline_2.12 discipline_2.13 discipline_3 discipline_2.12 discipline_2.13 discipline_3
+          modules-ignore: disciplinenative_2.12 disciplinenative_2.13 disciplinenative_3 disciplinejs_2.12 disciplinejs_2.13 disciplinejs_3 disciplinejvm_2.12 disciplinejvm_2.13 disciplinejvm_3
           configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/.mergify.yml b/.mergify.yml
@@ -10,15 +10,15 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJS)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootNative)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJS)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootNative)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJS)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJVM)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootNative)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineNative)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJS)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJVM)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineNative)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJS)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJVM)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineNative)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJS)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJVM)
   actions:
     merge: {}
 - name: Label core PRs

diff --git a/build.sbt b/build.sbt
@@ -14,11 +14,7 @@ ThisBuild / tlJdkRelease := Some(8)
 
 ThisBuild / tlSonatypeUseLegacyHost := false
 
-lazy val root = tlCrossRootProject
-  .aggregate(core)
-  .settings(
-    name := "discipline"
-  )
+lazy val discipline = tlCrossRootProject.aggregate(core)
 
 lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .crossType(CrossType.Pure)