Cross-compile with Scala Native #4279

jchyb · 2024-09-17T12:43:43Z

I intend to split this into smaller PR's starting with the macro replacing java reflection. This PR is only meant to showcase the larger picture of the changes and probably will not be merged (although finished and, as of writing, up to date). Nevertheless it would be very helpful to me to see if the CI is able to pass here.

tgodzik · 2024-09-17T12:52:57Z

bin/scala-native-setup/macos-setup.sh

@@ -0,0 +1,3 @@
+apt-get install -y clang-12.0
+PATH=/usr/lib/llvm-12.0/bin:${PATH}


Are you sure this is needed? I never had to install clang for native, I think it's included in the images.

I guess that's a leftover from the previous iteration, I wonder if I even needed it then? Removing now

maybe at some point?

tgodzik · 2024-09-17T12:53:54Z

scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/difflib/Equalizer.scala

@@ -0,0 +1,12 @@
+package org.scalafmt.cli.difflib


difflib is now published as munit-diff so you can use that

kitbellew

this is a huge change, thank you for this. however, i have to admit that i lost track of all the changes halfway through.

here my request: split into separate prs:

pure renames (code, tests, etc)
refactoring of jvm code which might need to have a custom implementation in native later
removing things like difflib, or adding fastparse (still haven't figured out why)
adding native at the end

looking at srcLine, I'm afraid there was some manual typing, rather than copy-paste, I'd strongly advise against that, as I can't eyeball everything

kitbellew · 2024-09-17T13:46:50Z

.github/workflows/ci.yml

+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v13


is this still used? i thought we replaced with setup-java a while ago...

kitbellew · 2024-09-17T13:48:56Z

.github/workflows/ci.yml

+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macOS-latest, ubuntu-latest]


you check for windows-latest below but it's not here...

kitbellew · 2024-09-17T13:51:50Z

.github/workflows/ci.yml

+        run: ./bin/scala-native-setup/windows-setup.sh
+      - if: matrix.os == 'macOS-latest'
+        name: setup macOS environment
+        run: ./bin/scala-native-setup/macos-setup.sh


is it possible to implement just one script, say, platform-setup.sh, and in that determine whether we are in Linux, macos or windows, so that we don't need to have this complexity here? after all, someone might want to run stuff from the command line, without GitHub actions

kitbellew · 2024-09-17T13:53:06Z

bin/scala-native-setup/ubuntu-setup.sh

@@ -0,0 +1,3 @@
+apt-get install -y clang-12.0
+PATH=/usr/lib/llvm-12.0/bin:${PATH}
+clang --version


missing newline

kitbellew · 2024-09-17T13:53:40Z

bin/scala-native-setup/macos-setup.sh

@@ -0,0 +1,3 @@
+apt-get install -y clang-12.0
+PATH=/usr/lib/llvm-12.0/bin:${PATH}
+clang --version


missing newline... could you please check other files as well?

kitbellew · 2024-09-17T14:35:10Z

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala

@@ -457,7 +450,7 @@ object State {
      adjustMargin: Int => Int,
      firstLength: Int,
  ): (Int, Int) = {
-    val matcher = getStripMarginPattern(pipe).matcher(syntax)
+    val matcher = getStripMarginPatternWithLineContent(pipe).matcher(syntax)


why did you need to add WithLineContent?

kitbellew · 2024-09-17T14:36:05Z

scalafmt-interfaces/native/src/main/scala/org/scalafmt/interfaces/RepositoryCredential.scala

@@ -0,0 +1,9 @@
+package org.scalafmt.interfaces;


kitbellew · 2024-09-17T14:39:02Z

scalafmt-tests/jvm/src/test/scala/org/scalafmt/ScalafmtProps.scala

@@ -1,6 +1,6 @@
 package org.scalafmt

-import org.scalafmt.CompatCollections.ParConverters._
+import org.scalafmt.CompatCollections.CompatParConverters._


I don't understand why this is needed. we have our own package already, why not define everything there?

kitbellew · 2024-09-17T14:40:14Z

scalafmt-tests/shared/src/test/resources/binPack/TermNameList

@@ -0,0 +1,8 @@
+binPack.literalArgumentLists = true


is this a new test?

kitbellew · 2024-09-17T14:41:52Z

scalafmt-tests/shared/src/test/scala/org/scalafmt/cli/CliTest.scala

@@ -314,6 +330,7 @@ trait CliTestBehavior {
    }

    test(s"scalafmt (no matching files) is okay with --mode diff and --stdin: $label") {
+      assumeNotDynamicOnNative()


why not create a method which wraps test() and calls this method before the rest of the body?

kitbellew · 2024-09-17T14:52:03Z

also, please add macros separately. i don't know why, but I didn't see them at all, they somehow got lost in the sea of changes.

tgodzik · 2024-09-18T16:31:49Z

.github/workflows/ci.yml

+      matrix:
+        os: [windows-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:


Github is complaining:

[Error](https://github.com/scalameta/scalafmt/actions/runs/10925443463/workflow) a step cannot have both the `uses` and `run` keys

Co-authored-by: Tomasz Godzik <tgodzik@users.noreply.github.com>

jchyb · 2024-09-27T16:38:00Z

Merged via related PRs

jchyb mentioned this pull request Sep 17, 2024

Add Scala Native support #2846

Closed

jchyb changed the title ~~Cross-compile to with Scala Native~~ Cross-compile with Scala Native Sep 17, 2024

tgodzik reviewed Sep 17, 2024

View reviewed changes

jchyb mentioned this pull request Sep 17, 2024

Replace java reflection with a macro-based solution #4280

Merged

jchyb force-pushed the feature/scala-native branch 2 times, most recently from e27b6ad to 03b20b7 Compare September 17, 2024 14:28

kitbellew requested changes Sep 17, 2024

View reviewed changes

jchyb force-pushed the feature/scala-native branch 2 times, most recently from 2a9bd3a to 5d96b36 Compare September 18, 2024 15:34

tgodzik reviewed Sep 18, 2024

View reviewed changes

jchyb force-pushed the feature/scala-native branch from 5d96b36 to f99af17 Compare September 19, 2024 09:19

This was referenced Sep 19, 2024

Prepare the build for cross compilation by renaming jvm sources #4282

Merged

Update libraries needed for cross compilation with Scala Native #4283

Merged

Cross compile scala-native-cli with Scala Native

3cd6da4

Co-authored-by: Tomasz Godzik <tgodzik@users.noreply.github.com>

jchyb force-pushed the feature/scala-native branch from f99af17 to 3cd6da4 Compare September 20, 2024 11:33

This was referenced Sep 23, 2024

Separate regex patterns to jvm-only directory in preparation for Scala Native #4309

Merged

Allow to compile with Scala Native #4325

Merged

jchyb closed this Sep 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cross-compile with Scala Native #4279

Cross-compile with Scala Native #4279

jchyb commented Sep 17, 2024 •

edited

Loading

tgodzik Sep 17, 2024

jchyb Sep 17, 2024

tgodzik Sep 17, 2024

tgodzik Sep 17, 2024

kitbellew left a comment

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew Sep 17, 2024

kitbellew commented Sep 17, 2024

tgodzik Sep 18, 2024

jchyb commented Sep 27, 2024

		@@ -0,0 +1,3 @@
		apt-get install -y clang-12.0
		PATH=/usr/lib/llvm-12.0/bin:${PATH}

Cross-compile with Scala Native #4279

Cross-compile with Scala Native #4279

Conversation

jchyb commented Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kitbellew left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kitbellew commented Sep 17, 2024

Choose a reason for hiding this comment

jchyb commented Sep 27, 2024

jchyb commented Sep 17, 2024 •

edited

Loading