Skip to content

Commit 9c9b862

Browse files
authored
Fix CI build (#138)
1 parent bfa329a commit 9c9b862

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
strategy:
3333
matrix:
3434
os: [ ubuntu-latest ]
35-
scala: [ '2.13.11', '3.3.0' ]
36-
java: [ '8', '20' ]
35+
scala: [ '2.13.13', '3.3.3' ]
36+
java: [ '11', '21' ]
3737
platform: [ 'jvm', 'js' ]
3838
runs-on: ${{ matrix.os }}
3939
steps:

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup Node.js environment
3535
uses: actions/setup-node@v3.5.1
3636
with:
37-
node-version: 16.x
37+
node-version: 18.x
3838
cache: yarn
3939
cache-dependency-path: ./vuepress/yarn.lock
4040

@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/setup-java@v3.9.0
4545
with:
4646
distribution: zulu
47-
java-version: 8
47+
java-version: 11
4848

4949
- run: yarn --cwd ./vuepress add -D vuepress@next
5050

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v3
1919
with:
2020
distribution: 'zulu'
21-
java-version: '8'
21+
java-version: '11'
2222
- run: ./mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll
2323
env:
2424
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

.mill-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.12
1+
0.10.15

build.sc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ object D {
133133
}
134134

135135
object V {
136-
val scala213 = "2.13.11"
137-
val scala3 = "3.3.1"
136+
val scala213 = "2.13.13"
137+
val scala3 = "3.3.3"
138138
val scalaAll = scala213 :: scala3 :: Nil
139139
val scalaJS = "1.13.0"
140140

@@ -145,7 +145,7 @@ object V {
145145
def izumiReflect = "2.3.8"
146146
def scalacheck = "1.17.0"
147147

148-
def kindProjector = "0.13.2"
148+
def kindProjector = "0.13.3"
149149
}
150150

151151
////// Module definition helpers //////////////////////////////////////
@@ -261,7 +261,8 @@ trait DecrelModuleBase
261261
"-explaintypes",
262262
"-Vimplicits",
263263
"-Vtype-diffs",
264-
"-P:kind-projector:underscore-placeholders"
264+
"-P:kind-projector:underscore-placeholders",
265+
"-Xmigration"
265266
)
266267

267268
private val scalacOptions3 = scalacOptionsCommon ::: List(

core/src/decrel/reify/Cache.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import izumi.reflect.Tag
1414
/**
1515
* Simple cache implementation that is reusable across various integrations
1616
*/
17-
case class Cache private (
18-
private[decrel] val entries: Map[Cache.Key[?, ?, ?], Cache.Entry[?, ?, ?]]
17+
final case class Cache(
18+
entries: Map[Cache.Key[?, ?, ?], Cache.Entry[?, ?, ?]]
1919
) {
2020

2121
def add[Rel, A, B](relation: Rel & Relation[A, B], key: A, value: B)(implicit

zquery/src/decrel/reify/zquery.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ trait zquery[R] extends bifunctor.module[ZQuery[R, +*, +*]] {
6666
ZIO.foldLeft(requests)(CompletedRequestMap.empty) { (crm, request) =>
6767
resultsMap.get(request.id) match {
6868
case Some(result) =>
69-
ZIO.succeed(crm.insert(request)(Right(result)))
69+
ZIO.succeed(crm.insert(request)(Exit.succeed(result)))
7070
case None =>
7171
ZIO.die(
7272
new NoSuchElementException(s"Response for request not found: ${request.id}")
@@ -76,7 +76,7 @@ trait zquery[R] extends bifunctor.module[ZQuery[R, +*, +*]] {
7676
}.catchAll { e =>
7777
ZIO.succeed(
7878
requests.foldLeft(CompletedRequestMap.empty) { (crm, request) =>
79-
crm.insert(request)(Left(e))
79+
crm.insert(request)(Exit.fail(e))
8080
}
8181
)
8282
}
@@ -301,7 +301,7 @@ trait zquery[R] extends bifunctor.module[ZQuery[R, +*, +*]] {
301301
val key: k.Input = k._key
302302
val value: k.Result = v.valueEv(v._value)
303303
Ref
304-
.make[Option[Either[Nothing, k.Result]]](Some(Right(value)))
304+
.make[Option[Exit[Nothing, k.Result]]](Some(Exit.succeed(value)))
305305
.flatMap { value =>
306306
zCache.put(
307307
RelationRequest[k.R, k.Input, Nothing, k.Result](relation, key),

0 commit comments

Comments
 (0)