Skip to content

Conversation

@kitbellew
Copy link
Collaborator

Put some shared code in jvm-native/ and some in jvm/ or native/.

@kitbellew kitbellew force-pushed the 4800 branch 3 times, most recently from b239892 to 78c2973 Compare February 9, 2025 13:30
@kitbellew kitbellew merged commit 0bdbf03 into scalameta:main Feb 10, 2025
32 checks passed
@kitbellew kitbellew deleted the 4800 branch February 10, 2025 00:49
mbland added a commit to mbland/rules_scala that referenced this pull request Feb 27, 2025
Also updates `scripts/create_repository.py` to prevent
`scala-collection-compat` versions from flipping on subsequent runs by
no longer comparing Scala versions. Part of bazel-contrib#1482.

Both Scalafmt and ScalaPB depend on
`org_scala_lang_modules_scala_collection_compat`. Before removing the
Scala version comparison, subsequent `create_repository.py` runs would
flip between these two artifacts for Scala 3.3 through 3.6:

- `org.scala-lang.modules:scala-collection-compat_2.13:2.13.0`
- `org.scala-lang.modules:scala-collection-compat_3:2.12.0`

The artifact with the higher release version number is preferable to the
artifact with the higher Scala version.

The change from `FileOps` to `PlatformFileOps` in `ScalafmtAdapter` is a
consequence of an update first included in Scalafmt 3.9.0:

- scalameta/scalafmt#4800
- scalameta/scalafmt@0bdbf03
simuons pushed a commit to bazel-contrib/rules_scala that referenced this pull request Feb 28, 2025
Also updates `scripts/create_repository.py` to prevent
`scala-collection-compat` versions from flipping on subsequent runs by
no longer comparing Scala versions. Part of #1482.

Both Scalafmt and ScalaPB depend on
`org_scala_lang_modules_scala_collection_compat`. Before removing the
Scala version comparison, subsequent `create_repository.py` runs would
flip between these two artifacts for Scala 3.3 through 3.6:

- `org.scala-lang.modules:scala-collection-compat_2.13:2.13.0`
- `org.scala-lang.modules:scala-collection-compat_3:2.12.0`

The artifact with the higher release version number is preferable to the
artifact with the higher Scala version.

The change from `FileOps` to `PlatformFileOps` in `ScalafmtAdapter` is a
consequence of an update first included in Scalafmt 3.9.0:

- scalameta/scalafmt#4800
- scalameta/scalafmt@0bdbf03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant