Fix compiling after merge error for Scala 3 (#1509)

* Fix compiling after merge error for Scala 3 * Fix website CI * Fix website CI * Manually install sbt via action
zio · Dec 29, 2024 · f2b642e · f2b642e
1 parent 23899f8
commit f2b642e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Check Document Generation
-        run: ./sbt docs/compileDocs
+        run: sbt docs/compileDocs
 
   lint:
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -21,14 +21,16 @@ jobs:
       uses: actions/checkout@v3.3.0
       with:
         fetch-depth: '0'
-    - name: Setup Scala
+    - name: Setup JVM
       uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Check website build process
-      run: sbt  docs/buildWebsite
+      run: sbt docs/buildWebsite
   publish-docs:
     name: Publish Docs
     runs-on: ubuntu-latest
@@ -38,19 +40,21 @@ jobs:
       uses: actions/checkout@v3.3.0
       with:
         fetch-depth: '0'
-    - name: Setup Scala
+    - name: Setup JVM
       uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Setup NodeJs
       uses: actions/setup-node@v3
       with:
         node-version: 16.x
         registry-url: https://registry.npmjs.org
     - name: Publish Docs to NPM Registry
-      run: sbt  docs/publishToNpm
+      run: sbt docs/publishToNpm
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
   generate-readme:
@@ -63,14 +67,16 @@ jobs:
       with:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
-    - name: Setup Scala
+    - name: Setup JVM
       uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Generate Readme
-      run: sbt  docs/generateReadme
+      run: sbt docs/generateReadme
     - name: Commit Changes
       run: |
         git config --local user.email "github-actions[bot]@users.noreply.github.com"

diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala b/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala
@@ -4,7 +4,7 @@ import zio.Config.*
 import zio.config.*
 import zio.config.derivation.*
 import zio.config.magnolia.DeriveConfig.*
-import zio.{Chunk, Config, LogLevel}
+import zio.{Chunk, Config, LogLevel, NonEmptyChunk}
 
 import java.net.URI
 import java.time.{LocalDate, LocalDateTime, LocalTime, OffsetDateTime, *}