8000 Add AdoptOpenJDK JDK 11 to the PR validation by eed3si9n · Pull Request #8207 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Add AdoptOpenJDK JDK 11 to the PR validation #8207

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 8000 to your account

Closed
wants to merge 4 commits into from
Closed

Add AdoptOpenJDK JDK 11 to the PR validation #8207

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54f211c
Add AdoptOpenJDK JDK 11 to the PR validation
eed3si9n Jul 10, 2019
d6bcddf
[nomerge] use linesIterator instead on lines in project/*.scala files
xuwei-k Sep 27, 2018
3849c0a
[nomerge] Restore/use linesIterator to avoid conflict String.lines
retronym Sep 10, 2018
9e38e73
unset JAVA_HOME
eed3si9n Jul 11, 2019
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
Prev Previous commit
Next Next commit
[nomerge] use linesIterator instead on lines in project/*.scala files
  • Loading branch information
@xuwei-k @eed3si9n
xuwei-k authored and eed3si9n committed Jul 10, 2019
commit d6bcddf7f0505209b581b4d1f95d743cefaf81ec
12 changes: 6 additions & 6 deletions project/GenerateAnyVals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import scala.language.implicitConversions"""
case _ => Nil
}
if (coercions.isEmpty) Nil
else coercionComment.lines.toList ++ coercions
else coercionComment.linesIterator.toList ++ coercions
}

def isCardinal: Boolean = isIntegerType(this)
Expand Down Expand Up @@ -174,7 +174,7 @@ import scala.language.implicitConversions"""
}
def objectLines = {
val comp = if (isCardinal) cardinalCompanion else floatingCompanion
interpolate(comp + allCompanions + "\n" + nonUnitCompanions).trim.lines.toList ++ (implicitCoercions map interpolate)
interpolate(comp + allCompanions + "\n" + nonUnitCompanions).trim.linesIterator.toList ++ (implicitCoercions map interpolate)
}

/** Makes a set of binary operations based on the given set of ops, args, and resultFn.
Expand Down Expand Up @@ -220,7 +220,7 @@ import scala.language.implicitConversions"""
def representation = repr.map(", a " + _).getOrElse("")

def indent(s: String) = if (s == "") "" else " " + s
def indentN(s: String) = s.lines map indent mkString "\n"
def indentN(s: String) = s.linesIterator map indent mkString "\n"

def boxUnboxInterpolations = Map(
"@boxRunTimeDoc@" -> """
Expand Down Expand Up @@ -448,9 +448,9 @@ def ^(x: Boolean): Boolean

// Provide a more specific return type for Scaladoc
override def getClass(): Class[Boolean] = ???
""".trim.lines.toList
""".trim.linesIterator.toList

def objectLines = interpolate(allCompanions + "\n" + nonUnitCompanions).lines.toList
def objectLines = interpolate(allCompanions + "\n" + nonUnitCompanions).linesIterator.toList
}
object U extends AnyValRep("Unit", None, "void") {
override def classDoc = """
Expand All @@ -464,7 +464,7 @@ override def getClass(): Class[Boolean] = ???
"// Provide a more specific return type for Scaladoc",
"override def getClass(): Class[Unit] = ???"
)
def objectLines = interpolate(allCompanions).lines.toList
def objectLines = interpolate(allCompanions).linesIterator.toList

override def boxUnboxInterpolations = Map(
"@boxRunTimeDoc@" -> "",
Expand Down
2 changes: 1 addition & 1 deletion project/VersionUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object VersionUtil {
| / __/ __// _ | / / / _ |
| __\ \/ /__/ __ |/ /__/ __ |
| /____/\___/_/ |_/____/_/ | |
| |/ %s""".stripMargin.lines.drop(1).map(s => s"${ "%n" }${ s }").mkString,
| |/ %s""".stripMargin.linesIterator.drop(1).map(s => s"${ "%n" }${ s }").mkString,
resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue,
generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ concurrentRestrictions in Global := Seq(

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")

addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.16")
0