Skip to content

Commit d48c691

Browse files
Update Scala Native to 0.5.8 (#3728)
* Update test-runner, tools to 0.5.8 * Adjust reference docs * Set Scala 3 Next RC announced version to 3.7.1-RC2 * adjust Scala Native LTO optimisation tests to `full` mode and run them on Mac --------- Co-authored-by: Piotr Chabelski <ged.subfan@gmail.com>
1 parent 4676cd1 commit d48c691

File tree

8 files changed

+21
-22
lines changed

8 files changed

+21
-22
lines changed

modules/integration/src/test/scala/scala/cli/integration/RunScalaNativeTestDefinitions.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trait RunScalaNativeTestDefinitions { _: RunTestDefinitions =>
5454
val message = "Hello"
5555
val inputs = TestInputs(
5656
os.rel / fileName ->
57-
s"""//> using nativeLto thin
57+
s"""//> using nativeLto full
5858
|println("$message")
5959
|""".stripMargin
6060
)
@@ -67,10 +67,9 @@ trait RunScalaNativeTestDefinitions { _: RunTestDefinitions =>
6767
}
6868
}
6969

70-
if (!Properties.isMac)
71-
test("scala native with lto optimisation") {
72-
TestUtil.retryOnCi()(scalaNativeLtoTests())
73-
}
70+
test("scala native with lto optimisation") {
71+
TestUtil.retryOnCi()(scalaNativeLtoTests())
72+
}
7473

7574
test("simple script native command") {
7675
TestUtil.retryOnCi() {

project/deps/package.mill.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object Scala {
1717
def scala3NextAnnounced =
1818
s"$scala3NextPrefix.0" // the newest/next version of Scala that's been announced
1919
def scala3NextRc = "3.7.1-RC2" // the latest RC version of Scala Next
20-
def scala3NextRcAnnounced = "3.7.1-RC1" // the latest announced RC version of Scala Next
20+
def scala3NextRcAnnounced = scala3NextRc // the latest announced RC version of Scala Next
2121

2222
// The Scala version used to build the CLI itself.
2323
def defaultInternal = sys.props.get("scala.version.internal").getOrElse(scala3Lts)
@@ -122,7 +122,7 @@ object Deps {
122122
def scalaMeta = "4.13.6"
123123
def scalafmt = "3.9.7"
124124
def scalaNative04 = "0.4.17"
125-
def scalaNative05 = "0.5.7"
125+
def scalaNative05 = "0.5.8"
126126
def scalaNative = scalaNative05
127127
def maxScalaNativeForToolkit = scalaNative05
128128
def maxScalaNativeForTypelevelToolkit = scalaNative04

website/docs/reference/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
14201420

14211421
### `--native-version`
14221422

1423-
Set the Scala Native version (0.5.7 by default).
1423+
Set the Scala Native version (0.5.8 by default).
14241424

14251425
### `--native-mode`
14261426

website/docs/reference/directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ Add Scala Native options
528528

529529
`//> using nativeLto full`
530530

531-
`//> using nativeVersion 0.5.7`
531+
`//> using nativeVersion 0.5.8`
532532

533533
`//> using nativeCompile -flto=thin`
534534

website/docs/reference/scala-command/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
854854

855855
`SHOULD have` per Scala Runner specification
856856

857-
Set the Scala Native version (0.5.7 by default).
857+
Set the Scala Native version (0.5.8 by default).
858858

859859
### `--native-mode`
860860

website/docs/reference/scala-command/directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ Add Scala Native options
344344

345345
`//> using nativeLto full`
346346

347-
`//> using nativeVersion 0.5.7`
347+
`//> using nativeVersion 0.5.8`
348348

349349
`//> using nativeCompile -flto=thin`
350350

website/docs/reference/scala-command/runner-specification.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
178178

179179
**--native-version**
180180

181-
Set the Scala Native version (0.5.7 by default).
181+
Set the Scala Native version (0.5.8 by default).
182182

183183
**--native-mode**
184184

@@ -972,7 +972,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
972972

973973
**--native-version**
974974

975-
Set the Scala Native version (0.5.7 by default).
975+
Set the Scala Native version (0.5.8 by default).
976976

977977
**--native-mode**
978978

@@ -1567,7 +1567,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
15671567

15681568
**--native-version**
15691569

1570-
Set the Scala Native version (0.5.7 by default).
1570+
Set the Scala Native version (0.5.8 by default).
15711571

15721572
**--native-mode**
15731573

@@ -2188,7 +2188,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
21882188

21892189
**--native-version**
21902190

2191-
Set the Scala Native version (0.5.7 by default).
2191+
Set the Scala Native version (0.5.8 by default).
21922192

21932193
**--native-mode**
21942194

@@ -2828,7 +2828,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
28282828

28292829
**--native-version**
28302830

2831-
Set the Scala Native version (0.5.7 by default).
2831+
Set the Scala Native version (0.5.8 by default).
28322832

28332833
**--native-mode**
28342834

@@ -3444,7 +3444,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
34443444

34453445
**--native-version**
34463446

3447-
Set the Scala Native version (0.5.7 by default).
3447+
Set the Scala Native version (0.5.8 by default).
34483448

34493449
**--native-mode**
34503450

@@ -4097,7 +4097,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
40974097

40984098
**--native-version**
40994099

4100-
Set the Scala Native version (0.5.7 by default).
4100+
Set the Scala Native version (0.5.8 by default).
41014101

41024102
**--native-mode**
41034103

@@ -4810,7 +4810,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
48104810

48114811
**--native-version**
48124812

4813-
Set the Scala Native version (0.5.7 by default).
4813+
Set the Scala Native version (0.5.8 by default).
48144814

48154815
**--native-mode**
48164816

@@ -5779,7 +5779,7 @@ Enable Scala Native. To show more options for Scala Native pass `--help-native`
57795779

57805780
**--native-version**
57815781

5782-
Set the Scala Native version (0.5.7 by default).
5782+
Set the Scala Native version (0.5.8 by default).
57835783

57845784
**--native-mode**
57855785

website/docs/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,14 +3255,14 @@ The available options are "thin", "full" and "none".
32553255
You can do it with the `--native-lto` option from the command line:
32563256

32573257
```bash
3258-
scala-cli -e 'println("Hello")' --native --native-lto thin
3258+
scala-cli -e 'println("Hello")' --native --native-lto full
32593259
```
32603260

32613261
Or with a `using` directive:
32623262

32633263
```scala compile
32643264
//> using platform "scala-native"
3265-
//> using nativeLto "thin"
3265+
//> using nativeLto "full"
32663266
@main def main(): Unit = println("Hello")
32673267
```
32683268

0 commit comments

Comments
 (0)