-
Notifications
You must be signed in to change notification settings - Fork 158
Add support for exporting to Mill 1.1.x series (tests on Mill 1.1.0-RC4) #4055
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
modules/integration/src/test/scala/scala/cli/integration/ExportMill11Tests212.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package scala.cli.integration | ||
|
|
||
| class ExportMill11Tests212 extends ExportMillTestDefinitions with Test212 with TestMill11 |
27 changes: 27 additions & 0 deletions
27
modules/integration/src/test/scala/scala/cli/integration/ExportMill11Tests213.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package scala.cli.integration | ||
|
|
||
| class ExportMill11Tests213 extends ExportMillTestDefinitions with Test213 with TestMill11 { | ||
| if runExportTests then { | ||
| test(s"scalac options$commonTestDescriptionSuffix") { | ||
| simpleTest( | ||
| inputs = ExportTestProjects.scalacOptionsScala2Test(actualScalaVersion), | ||
| mainClass = None, | ||
| extraExportArgs = defaultExportCommandArgs | ||
| ) | ||
| } | ||
| test(s"pure java$commonTestDescriptionSuffix") { | ||
| simpleTest( | ||
| inputs = ExportTestProjects.pureJavaTest("ScalaCliJavaTest"), | ||
| mainClass = None, | ||
| extraExportArgs = defaultExportCommandArgs | ||
| ) | ||
| } | ||
| test(s"custom JAR$commonTestDescriptionSuffix") { | ||
| simpleTest( | ||
| inputs = ExportTestProjects.customJarTest(actualScalaVersion), | ||
| mainClass = None, | ||
| extraExportArgs = defaultExportCommandArgs | ||
| ) | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
modules/integration/src/test/scala/scala/cli/integration/ExportMill11Tests3Lts.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package scala.cli.integration | ||
|
|
||
| class ExportMill11Tests3Lts extends ExportMillTestDefinitions with Test3Lts with TestMill11 |
3 changes: 3 additions & 0 deletions
3
modules/integration/src/test/scala/scala/cli/integration/ExportMill11TestsDefault.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package scala.cli.integration | ||
|
|
||
| class ExportMill11TestsDefault extends ExportMillTestDefinitions with TestDefault with TestMill11 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To work around com-lihaoyi/mill#6632 / com-lihaoyi/mill#6623, we will now default exported mill launchers to the main branch of the Mill repo, with the option to instead use the version tag hidden behind a flag.
Since export is probably forever an experimental endeavour, and some legacy Mill versions would require using a more recent launcher script anyway, this feels like the lesser evil here.