Skip to content

Commit a740299

Browse files
Merge branch 'main' into update/bcprov-jdk18on-1.82
Conflicts: build.mill
2 parents f0360f4 + 7cac5bf commit a740299

7 files changed

Lines changed: 805 additions & 229 deletions

File tree

.github/workflows/run-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
command: 'terminal.__.test'
2323

2424
- java-version: 11
25-
command: 'sshd[{2.12.20,2.13.16,3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
25+
command: 'sshd[{2.12.20,2.13.17,3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
2626

2727
- java-version: 11
2828
command: 'amm.repl[2.12.{9,14,20}].__.test'
2929
- java-version: 17
30-
command: 'amm.repl[2.13.{4,9,16}].__.test'
30+
command: 'amm.repl[2.13.{4,9,17}].__.test'
3131
- java-version: 21
3232
command: 'amm.repl[{3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
3333

3434
- java-version: 11
3535
command: 'amm[2.12.{9,14,20}].__.test'
3636
- java-version: 17
37-
command: 'amm[2.13.{4,9,16}].__.test'
37+
command: 'amm[2.13.{4,9,17}].__.test'
3838
- java-version: 21
3939
command: 'amm[{3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
4040

@@ -101,4 +101,4 @@ jobs:
101101
with:
102102
java-version: 11
103103
distribution: temurin
104-
- run: ./mill -i -k -j4 '__.compile'
104+
- run: ./mill -i -k -j1 '__.compile'

.mill-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.0
1+
0.12.16

amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ object AdvancedTests extends TestSuite {
320320
check.session("""
321321
@ // Compiler plugins imported without `.$plugin` are not loaded
322322
323-
@ import $ivy.`org.typelevel:::kind-projector:0.13.3`
323+
@ import $ivy.`org.typelevel:::kind-projector:0.13.4`
324324
325325
@ trait TC0[F[_]]
326326
defined trait TC0
@@ -330,7 +330,7 @@ object AdvancedTests extends TestSuite {
330330
331331
@ // You need to use `import $plugin.$ivy`
332332
333-
@ import $plugin.$ivy.`org.typelevel:::kind-projector:0.13.3`
333+
@ import $plugin.$ivy.`org.typelevel:::kind-projector:0.13.4`
334334
335335
@ trait TC[F[_]]
336336
defined trait TC

0 commit comments

Comments
 (0)