From f2b642ef8b568a0823b8f4167bec598ff0766207 Mon Sep 17 00:00:00 2001
From: kyri-petrou <67301607+kyri-petrou@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:02:03 +0200
Subject: [PATCH] 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
---
 .github/workflows/ci.yml                       |  2 +-
 .github/workflows/site.yml                     | 18 ++++++++++++------
 .../zio/config/magnolia/DeriveConfig.scala     |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81f936ee7..69bb904ff 100644
--- 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
index 4af492966..8f01d0e1b 100644
--- 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
index eebab22fd..bed52312f 100644
--- 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, *}