Skip to content
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

Jump to bottom

refactor: Rewrite unicode arrow #1648

Merged
merged 1 commit into from
Nov 11, 2024
Merged

refactor: Rewrite unicode arrow #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ object JDKPackagerAntHelper {

// Unlift searchPoint `Option`-s, and for each base directory, add the parent variant to cover nested JREs on Unix.
val entryPoints =
searchPoints.flatten.flatMap(f ⇒ Seq(f, f.getAbsoluteFile))
searchPoints.flatten.flatMap(f => Seq(f, f.getAbsoluteFile))

// On Windows we're often running in the JRE and not the JDK. If JDK is installed,
// it's likely to be in a parallel directory, with the "jre" prefix changed to "jdk"
val entryPointsSpecialCaseWindows = entryPoints.flatMap { f ⇒
val entryPointsSpecialCaseWindows = entryPoints.flatMap { f =>
if (f.getName.startsWith("jre"))
Seq(f, f.getParentFile / ("jdk" + f.getName.drop(3)))
else Seq(f)
Expand All @@ -52,11 +52,11 @@ object JDKPackagerAntHelper {
// Now search for the tool
entryPointsSpecialCaseWindows
.map(_ / "lib" / jarname)
.find { f ⇒
.find { f =>
logger.debug(s"Looking for '$jarname' in '${f.getParent}'");
f.exists()
}
.map { f ⇒
.map { f =>
logger.debug(s"Found '$f'!"); f
}
}
Expand Down Expand Up @@ -234,7 +234,7 @@ object JDKPackagerAntHelper {
Seq("*.dmg", "*.pkg", "*.app", "*.msi", "*.exe", "*.deb", "*.rpm")
val finder = globs.foldLeft(PathFinder.empty)(_ +++ output ** _)
val result = finder.getPaths.headOption
result.foreach(f ⇒ s.log.info("Wrote " + f))
result.foreach(f => s.log.info("Wrote " + f))
result.map(file)
}

Expand All @@ -249,7 +249,7 @@ object JDKPackagerAntHelper {

/** Build package via Ant build.xml definition. */
private[jdkpackager] def buildPackageWithAnt(buildXML: File, target: File, s: TaskStreams): File = {
import org.apache.tools.ant.{Project ⇒ AntProject}
import org.apache.tools.ant.{Project => AntProject}

val ap = new AntProject
ap.setUserProperty("ant.file", buildXML.getAbsolutePath)
Expand All @@ -269,7 +269,7 @@ object JDKPackagerAntHelper {

/** For piping Ant messages to sbt logger. */
private class AntLogAdapter(s: TaskStreams) extends BuildListener {
import org.apache.tools.ant.{Project ⇒ AntProject}
import org.apache.tools.ant.{Project => AntProject}
def buildFinished(event: BuildEvent): Unit = ()
def buildStarted(event: BuildEvent): Unit = ()
def targetStarted(event: BuildEvent): Unit = ()
Expand All @@ -278,11 +278,11 @@ object JDKPackagerAntHelper {
def taskStarted(event: BuildEvent): Unit = ()
def messageLogged(event: BuildEvent): Unit =
event.getPriority match {
case AntProject.MSG_ERR ⇒ s.log.error(event.getMessage)
case AntProject.MSG_WARN ⇒ s.log.warn(event.getMessage)
case AntProject.MSG_INFO ⇒ s.log.info(event.getMessage)
case AntProject.MSG_VERBOSE ⇒ s.log.verbose(event.getMessage)
case _ ⇒ s.log.debug(event.getMessage)
case AntProject.MSG_ERR => s.log.error(event.getMessage)
case AntProject.MSG_WARN => s.log.warn(event.getMessage)
case AntProject.MSG_INFO => s.log.info(event.getMessage)
case AntProject.MSG_VERBOSE => s.log.verbose(event.getMessage)
case _ => s.log.debug(event.getMessage)
}
}
}
12 changes: 6 additions & 6 deletions src/sbt-test/jdkpackager/test-package-image/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ jdkPackagerAssociations := Seq(
)

lazy val iconGlob = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ "*.icns"
case os if os.contains("win") ⇒ "*.ico"
case _ ⇒ "*.png"
case os if os.contains("mac") => "*.icns"
case os if os.contains("win") => "*.ico"
case _ => "*.png"
}

jdkAppIcon := (baseDirectory.value / ".." / ".." / ".." / ".." / "test-project-jdkpackager" ** iconGlob).getPaths.headOption
.map(file)

TaskKey[Unit]("checkImage") := {
val (extension, os) = sys.props("os.name").toLowerCase match {
case osys if osys.contains("mac") ⇒ (".app", 'mac)
case osys if osys.contains("win") ⇒ (".exe", 'windows)
case _ ⇒ ("", 'linux)
case osys if osys.contains("mac") => (".app", 'mac)
case osys if osys.contains("win") => (".exe", 'windows)
case _ => ("", 'linux)
}
val expectedImage = (JDKPackager / target).value / "bundles" / (name.value + extension)
println(s"Checking for '${expectedImage.getAbsolutePath}'")
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/jdkpackager/test-package-image/src/main/scala/ExampleApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ExampleApp extends Application {
win.initOwner(stage)

val args = getParameters.getRaw.mkString("\n")
val props = sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n")
val props = sys.props.toSeq.sortBy(_._1).map(p => s"${p._1}=${p._2}").mkString("\n")

val content = new TextArea(Seq("## Application Arguments", args, "## System Properties", props).mkString("\n"))
content.setPrefHeight(400)
Expand Down
18 changes: 9 additions & 9 deletions src/sbt-test/jdkpackager/test-package-mappings/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,36 @@ Universal / mappings ++= {
}

lazy val iconGlob = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ "*.icns"
case os if os.contains("win") ⇒ "*.ico"
case _ ⇒ "*.png"
case os if os.contains("mac") => "*.icns"
case os if os.contains("win") => "*.ico"
case _ => "*.png"
}

jdkAppIcon := (baseDirectory.value / ".." / ".." / ".." / ".." / "test-project-jdkpackager" ** iconGlob).getPaths.headOption
.map(file)

TaskKey[Unit]("checkImage") := {
val (extension, os) = sys.props("os.name").toLowerCase match {
case osys if osys.contains("mac") ⇒ (".app", 'mac)
case osys if osys.contains("win") ⇒ (".exe", 'windows)
case _ ⇒ ("", 'linux)
case osys if osys.contains("mac") => (".app", 'mac)
case osys if osys.contains("win") => (".exe", 'windows)
case _ => ("", 'linux)
}
val expectedImage = (JDKPackager / target).value / "bundles" / (name.value + extension)
println(s"Checking for '${expectedImage.getAbsolutePath}'")
assert(expectedImage.exists, s"Expected image file to be found at '$expectedImage'")

val files = os match {
case 'mac ⇒
case 'mac =>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Speaking of deprecated features, I see there are symbol literals in the codebase

Seq(
expectedImage / "Contents" / "Java" / "README.md",
expectedImage / "Contents" / "Java" / "stuff" / "something-1.md",
expectedImage / "Contents" / "Java" / "stuff" / "something-2.md"
)
case _ ⇒
case _ =>
streams.value.log.warn("Test needs to be implemented for " + sys.props("os.name"))
Seq.empty
}

println(s"Checking for ${files.map(_.getName).mkString(", ")}")
files.foreach(f ⇒ assert(f.exists, "Expected to find " + f))
files.foreach(f => assert(f.exists, "Expected to find " + f))
}
2 changes: 1 addition & 1 deletion src/sbt-test/jdkpackager/test-package-mappings/src/main/scala/ExampleApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ExampleApp extends Application {
val win = new Stage(StageStyle.UTILITY)
win.initModality(Modality.APPLICATION_MODAL)
win.initOwner(stage)
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n"))
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p => s"${p._1}=${p._2}").mkString("\n"))
content.setPrefHeight(400)
win.setScene(new Scene(content))
win.sizeToScene()
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/jdkpackager/test-package-minimal/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jdkPackagerType := "image"

TaskKey[Unit]("checkImage") := {
val extension = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ ".app"
case os if os.contains("win") ⇒ ".exe"
case _ ⇒ ""
case os if os.contains("mac") => ".app"
case os if os.contains("win") => ".exe"
case _ => ""
}
val expectedImage = (JDKPackager / target).value / "bundles" / (name.value + extension)
println(s"Checking for '${expectedImage.getAbsolutePath}'")
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/ExampleApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ExampleApp extends Application {
val win = new Stage(StageStyle.UTILITY)
win.initModality(Modality.APPLICATION_MODAL)
win.initOwner(stage)
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n"))
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p => s"${p._1}=${p._2}").mkString("\n"))
content.setPrefHeight(400)
win.setScene(new Scene(content))
win.sizeToScene()
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/jlink/test-jlink-minimal/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ TaskKey[Unit]("runChecks") := {
}

val (extension, os) = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ (".app", 'mac)
case os if os.contains("win") ⇒ (".exe", 'windows)
case _ ⇒ ("", 'linux)
case os if os.contains("mac") => (".app", 'mac)
case os if os.contains("win") => (".exe", 'windows)
case _ => ("", 'linux)
}

val stageDir = (Universal / stagingDirectory).value
Expand Down
3 changes: 1 addition & 2 deletions src/sbt-test/jlink/test-jlink-misc/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ val issue1293 = project
// Use `paramaner` (and only it) as an automatic module
jlinkModulePath := {
// Get the full classpath with all the resolved dependencies.
(jlinkBuildImage / fullClasspath)
.value
(jlinkBuildImage / fullClasspath).value
// Find the ones that have `paranamer` as their artifact names.
.filter { item =>
item.get(moduleID.key).exists { modId =>
Expand Down
6 changes: 3 additions & 3 deletions src/sphinx/formats/jdkpackager.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ Here's what the build file looks like:
packageDescription := "A test package using Oracle's JDK bundled javapackager tool."

lazy val iconGlob = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ "*.icns"
case os if os.contains("win") ⇒ "*.ico"
case _ ⇒ "*.png"
case os if os.contains("mac") => "*.icns"
case os if os.contains("win") => "*.ico"
case _ => "*.png"
}

jdkAppIcon := (sourceDirectory.value ** iconGlob).getPaths.headOption.map(file)
Expand Down
6 changes: 3 additions & 3 deletions test-project-jdkpackager/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ packageSummary := "JDKPackagerPlugin example package thingy"
packageDescription := "A test package using Oracle's JDK bundled javapackager tool."

lazy val iconGlob = sys.props("os.name").toLowerCase match {
case os if os.contains("mac") ⇒ "*.icns"
case os if os.contains("win") ⇒ "*.ico"
case _ ⇒ "*.png"
case os if os.contains("mac") => "*.icns"
case os if os.contains("win") => "*.ico"
case _ => "*.png"
}

jdkAppIcon := (sourceDirectory.value ** iconGlob).getPaths.headOption.map(file)
Expand Down
2 changes: 1 addition & 1 deletion test-project-jdkpackager/src/main/scala/ExampleApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ExampleApp extends Application {
val win = new Stage(StageStyle.UTILITY)
win.initModality(Modality.APPLICATION_MODAL)
win.initOwner(stage)
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n"))
val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p => s"${p._1}=${p._2}").mkString("\n"))
content.setPrefHeight(400)
win.setScene(new Scene(content))
win.sizeToScene()
Expand Down