Skip to content

[POC] Use Unroll plugin for binary compatibility #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

[POC] Use Unroll plugin for binary compatibility #113

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f889a7
.
lihaoyi Feb 10, 2024
4c1b72d
0.1.7
lihaoyi Feb 10, 2024
b5a9ef9
.
lihaoyi Feb 10, 2024
c130c9c
bumpscalajs
lihaoyi Feb 10, 2024
77c8c33
unroll 0.1.12
lihaoyi Mar 21, 2024
0fccc7e
.
lihaoyi Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.github.lolgab.mill.mima._

val scala212 = "2.12.17"
val scala213 = "2.13.10"
val scala3 = "3.1.3"
val scala3 = "3.3.1"
Copy link
Member

@lefou lefou Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional? We drop support for older Scala 3 version, which might be Ok, but should be done in a new 0.x bump.

Copy link
Member Author

@lihaoyi lihaoyi Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a compiler plugin, so will need separate implementations for each Scala version I think.

It's possible to support 3.1.3, but the initial proof of concept is only against 3.3.1. Will have to decide whether or not to drop 3.1.3 before merging this, but I'd be in favor just to support the 3.3.x LTS versions


val osLib = "0.9.1"
val acyclic = "0.3.9"
Expand Down Expand Up @@ -42,18 +42,22 @@ trait MainArgsPublishModule
super.scalacOptions() ++
Option.when(!isScala3(scalaVersion()))("-P:acyclic:force")

def scalacPluginIvyDeps =
def scalacPluginIvyDeps = T{
super.scalacPluginIvyDeps() ++
Option.when(!isScala3(scalaVersion()))(ivy"com.lihaoyi:::acyclic:${acyclic}")
Agg(ivy"com.lihaoyi::unroll-plugin:0.1.9") ++
Option.when(!isScala3(scalaVersion()))(ivy"com.lihaoyi:::acyclic:${acyclic}")
}

def compileIvyDeps =
super.compileIvyDeps() ++
Agg.when(!isScala3(crossScalaVersion))(
ivy"com.lihaoyi:::acyclic:${acyclic}",
ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
)
Agg.when(!isScala3(crossScalaVersion))(
ivy"com.lihaoyi:::acyclic:${acyclic}",
ivy"org.scala-lang:scala-reflect:$crossScalaVersion",

)

def ivyDeps = Agg(
ivy"com.lihaoyi::unroll-annotation:0.1.9",
Copy link
Member

@lefou lefou Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is unroll-annotation needed transitively, or only at compile time?

Copy link
Member Author

@lihaoyi lihaoyi Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only at compile time. I can have the plugin remove the annotation if necessary, haven't thought deeply about whether that's the right thing to do

Copy link
Member

@lefou lefou Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should move it into compileIvyDeps then.

Since we are more or less generating stuff that is not part of the actual API but rather some inconvenient necessity, not forcing a transitive dependency on this implementation detail for all downstream users seem to be the right thing.

ivy"org.scala-lang.modules::scala-collection-compat::2.8.1",
)
}
Expand All @@ -74,13 +78,13 @@ object mainargs extends Module {

object js extends Cross[JSMainArgsModule](scalaVersions)
trait JSMainArgsModule extends MainArgsPublishModule with ScalaJSModule {
def scalaJSVersion = "1.10.1"
def scalaJSVersion = "1.13.1"
object test extends ScalaJSTests with CommonTestModule
}

object native extends Cross[NativeMainArgsModule](scalaVersions)
trait NativeMainArgsModule extends MainArgsPublishModule with ScalaNativeModule {
def scalaNativeVersion = "0.4.7"
def scalaNativeVersion = "0.4.14"
object test extends ScalaNativeTests with CommonTestModule
}
}
Expand Down
Loading