diff --git a/gifs/scenarios/complete-install.sh b/gifs/scenarios/complete-install.sh index 8c7da053e9..5cb8b1f22c 100755 --- a/gifs/scenarios/complete-install.sh +++ b/gifs/scenarios/complete-install.sh @@ -25,7 +25,7 @@ else doSleep 2 - pe "curl -sSLf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh" + pe "curl -sSLf https://scala-cli.virtuslab.org/get | sh" pe 'source ~/.profile' pe "echo 'println(\"Hello from scala-cli\")' | scala-cli -" diff --git a/modules/cli/src/main/scala/scala/cli/commands/update/Update.scala b/modules/cli/src/main/scala/scala/cli/commands/update/Update.scala index 4047a19d42..d887528566 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/update/Update.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/update/Update.scala @@ -79,7 +79,7 @@ object Update extends ScalaCommand[UpdateOptions] { } val installationScript = - ProcUtil.downloadFile("https://virtuslab.github.io/scala-cli-packages/scala-setup.sh") + ProcUtil.downloadFile("https://scala-cli.virtuslab.org/get") // format: off val res = os.proc( @@ -128,7 +128,7 @@ object Update extends ScalaCommand[UpdateOptions] { else if (isOutdated) println( s"""Your $fullRunnerName $currentVersion is outdated, please update $fullRunnerName to $newestScalaCliVersion0 - |Run 'curl -sSLf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh' to update $fullRunnerName.""".stripMargin + |Run 'curl -sSLf https://scala-cli.virtuslab.org/get | sh' to update $fullRunnerName.""".stripMargin ) } diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala index ceef5e05b5..87b3018f63 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala @@ -522,26 +522,30 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions => test("script wrappers satisfy strict compiler flags") { val inputs = TestInputs( os.rel / "strictClassWrapper.sc" -> - """//> using scala 3.3.1 - |//> using options -Werror -Wnonunit-statement -Wunused:all -Wvalue-discard - |//> using options -Yno-experimental -Ysafe-init -deprecation -feature -language:strictEquality - |//> using options -new-syntax -old-syntax -unchecked -no-indent - | - |println(strictObjectWrapper.Foo(42).x) - |""".stripMargin, - + """//> using scala 3.3.1 + |//> using options -Werror -Wnonunit-statement -Wunused:all -Wvalue-discard + |//> using options -Yno-experimental -Ysafe-init -deprecation -feature -language:strictEquality + |//> using options -new-syntax -old-syntax -unchecked -no-indent + | + |println(strictObjectWrapper.Foo(42).x) + |""".stripMargin, os.rel / "strictObjectWrapper.sc" -> - """//> using objectWrapper - |//> using scala 3.3.1 - |//> using options -Werror -Wnonunit-statement -Wunused:all -Wvalue-discard - |//> using options -Yno-experimental -Ysafe-init -deprecation -feature -language:strictEquality - |//> using options -new-syntax -old-syntax -unchecked -no-indent - | - |case class Foo(x: Int) - |""".stripMargin + """//> using objectWrapper + |//> using scala 3.3.1 + |//> using options -Werror -Wnonunit-statement -Wunused:all -Wvalue-discard + |//> using options -Yno-experimental -Ysafe-init -deprecation -feature -language:strictEquality + |//> using options -new-syntax -old-syntax -unchecked -no-indent + | + |case class Foo(x: Int) + |""".stripMargin ) inputs.fromRoot { root => - val p = os.proc(TestUtil.cli, "--power", "strictClassWrapper.sc", "strictObjectWrapper.sc").call(cwd = root) + val p = os.proc( + TestUtil.cli, + "--power", + "strictClassWrapper.sc", + "strictObjectWrapper.sc" + ).call(cwd = root) expect(p.out.trim() == "42") } } diff --git a/website/src/components/BasicInstall.js b/website/src/components/BasicInstall.js index c507ab0a80..5fac9238f8 100644 --- a/website/src/components/BasicInstall.js +++ b/website/src/components/BasicInstall.js @@ -26,7 +26,7 @@ export default function BasicInstall(props){

Run the following one-line command in your terminal:

- curl -sSLf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh + curl -sSLf https://scala-cli.virtuslab.org/get | sh