-
Notifications
You must be signed in to change notification settings - Fork 156
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
chore: Only verify Jdk 9 classes on jdk 11. #1078
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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,18 @@ | ||
#!/bin/bash | ||
|
||
echo "Checking Scala CLI version..." | ||
scala-cli --version | ||
|
||
echo "Starting verification with Scala-CLI..." | ||
|
||
for file in stream/target/scala-cli/*.sc; do | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Cool, has expandable capability. |
||
echo "Starting verification for with file: $file." | ||
if scala-cli "$file" ; then | ||
echo "Verification successful for $file." | ||
else | ||
echo "Error when verifying $file." | ||
exit 1 | ||
fi | ||
done | ||
|
||
echo "All verifications successful." |
This file contains 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 |
---|---|---|
|
@@ -22,24 +22,23 @@ object VerifyJDK9Classes { | |
lazy val settings: Seq[Setting[_]] = inConfig(Compile) { | ||
Seq { | ||
sourceGenerators += { | ||
generateAndWriteScalaCLIScript( | ||
target, | ||
_ / "scala-cli" / "VerifyJDK9Classes.sc") | ||
generateAndWriteScalaCLIScript(target) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. More readable! |
||
} | ||
} | ||
} | ||
|
||
def generateAndWriteScalaCLIScript(dir: SettingKey[File], locate: File => File): Def.Initialize[Task[Seq[sbt.File]]] = | ||
def generateAndWriteScalaCLIScript(dir: SettingKey[File]): Def.Initialize[Task[Seq[sbt.File]]] = | ||
Def.task[Seq[File]] { | ||
val script = generateScalaCLIScript(version.value) | ||
val file = locate(dir.value) | ||
val binaryVersion = scalaBinaryVersion.value | ||
val script = generateScalaCLIScript(version.value, binaryVersion) | ||
val file = dir.value / "scala-cli" / s"VerifyJDK9Classes-${binaryVersion}.sc" | ||
val content = script.stripMargin.format(version.value) | ||
if (!file.exists || IO.read(file) != content) IO.write(file, content) | ||
// the generated file is not used. | ||
Nil | ||
} | ||
|
||
private def generateScalaCLIScript(version: String): String = | ||
private def generateScalaCLIScript(version: String, scalaBinaryVersion: String): String = | ||
s""" | ||
|/* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
|
@@ -57,9 +56,8 @@ object VerifyJDK9Classes { | |
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|//> using scala 2.13 | ||
|//> using scala ${scalaBinaryVersion} | ||
|//> using dep "org.apache.pekko::pekko-stream:${version}" | ||
|////> using jvm 11 | ||
|object VerifyJDK9Classes { | ||
| def main(args: Array[String]): Unit = { | ||
| import org.apache.pekko.actor.ActorSystem | ||
|
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.
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.
Let's keep it for now, otherwise I have to revaluation it.