File tree Expand file tree Collapse file tree 5 files changed +13
-8
lines changed
modules/cli/src/main/scala/scala/cli/internal Expand file tree Collapse file tree 5 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ package scala.cli.internal
2
2
3
3
import coursier .Repositories
4
4
import coursier .cache .{ArchiveCache , FileCache }
5
+ import coursier .core .Version
5
6
import coursier .util .Task
6
7
import dependency ._
7
8
import org .scalajs .testing .adapter .{TestAdapterInitializer => TAI }
@@ -37,7 +38,10 @@ object ScalaJsLinker {
37
38
val scalaJsCliDep = {
38
39
val mod =
39
40
if (scalaJsCliVersion.contains(" -sc" ))
40
- mod " io.github.alexarchambault.tmp:scalajs-cli_2.13 "
41
+ if (Version (scalaJsCliVersion) < Version (" 1.1.2-sc1" ))
42
+ mod " io.github.alexarchambault.tmp:scalajs-cli_2.13 "
43
+ else
44
+ mod " io.github.alexarchambault.tmp:scalajscli- ${scalaJsVersion}_2.13 "
41
45
else
42
46
mod " org.scala-js:scalajs-cli_2.13 "
43
47
dependency.Dependency (mod, scalaJsCliVersion)
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ object Scala {
14
14
val mainVersions = Seq (scala3, scala213)
15
15
val runnerScalaVersions = runnerScala3 +: allScala2
16
16
17
- def scalaJs = " 1.10.1 "
17
+ def scalaJs = " 1.11.0 "
18
18
19
19
def listAll : Seq [String ] = {
20
20
def patchVer (sv : String ): Int =
@@ -74,7 +74,7 @@ object InternalDeps {
74
74
object Versions {
75
75
def mill = os.read(os.pwd / " .mill-version" ).trim
76
76
def lefouMillwRef = " 166bcdf5741de8569e0630e18c3b2ef7e252cd96"
77
- def scalaJsCli = " 1.1.1-sc6 "
77
+ def scalaJsCli = " 1.1.2-sc1 "
78
78
}
79
79
}
80
80
Original file line number Diff line number Diff line change @@ -172,4 +172,5 @@ The table below lists the last supported version of Scala.js in Scala CLI. If yo
172
172
| 0.1.0 - 0.1.2 | 1.8.0 |
173
173
| 0.1.3 | 1.9.0 |
174
174
| 0.1.4 - 0.1.8 | 1.10.0 |
175
- | 0.1.9 - current | 1.10.1 |
175
+ | 0.1.9 - 0.1.17 | 1.10.1 |
176
+ | 0.1.18 - current | 1.11.0 |
Original file line number Diff line number Diff line change @@ -1089,7 +1089,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
1089
1089
1090
1090
### ` --js-version `
1091
1091
1092
- The Scala.js version (1.10.1 by default).
1092
+ The Scala.js version (1.11.0 by default).
1093
1093
1094
1094
### ` --js-mode `
1095
1095
@@ -1149,7 +1149,7 @@ Path to the Scala.js linker
1149
1149
### ` --js-cli-version `
1150
1150
1151
1151
[ Internal]
1152
- Scala.js CLI version to use for linking (1.1.1-sc6 by default).
1152
+ Scala.js CLI version to use for linking (1.1.2-sc1 by default).
1153
1153
1154
1154
### ` --js-cli-java-arg `
1155
1155
Original file line number Diff line number Diff line change @@ -505,7 +505,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
505
505
506
506
### ` --js-version `
507
507
508
- The Scala.js version (1.10.1 by default).
508
+ The Scala.js version (1.11.0 by default).
509
509
510
510
### ` --js-mode `
511
511
@@ -565,7 +565,7 @@ Path to the Scala.js linker
565
565
### ` --js-cli-version `
566
566
567
567
[ Internal]
568
- Scala.js CLI version to use for linking (1.1.1-sc6 by default).
568
+ Scala.js CLI version to use for linking (1.1.2-sc1 by default).
569
569
570
570
### ` --js-cli-java-arg `
571
571
You can’t perform that action at this time.
0 commit comments