Skip to content

Commit 0621261

Browse files
committed
Undo incorrect or temp changes
1 parent 5189094 commit 0621261

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ on_success:
3131

3232
on_failure:
3333
- ps: postCommitStatus "failure"
34-
- cmd: type target\windows\scala.wxs
3534

3635
cache:
3736
- C:\sbt

project/ScalaDist.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ object ScalaDist {
6666
// to populate the rest of the distribution, explode scala-dist artifact itself
6767
Universal / mappings ++= createMappingsWith(update.value.toSeq, universalMappings),
6868

69-
// work around sbt / regression-native-packager 1.0.5 where
69+
// work around regression in sbt-native-packager 1.0.5 where
7070
// these tasks invoke `tar` without any flags at all. the issue
71-
// was 1 / fixed.1.0, so this could be revisited when we upgrade
71+
// was fixed in 1.1.0, so this could be revisited when we upgrade
7272
UniversalDocs / packageZipTarball / universalArchiveOptions := Seq("--force-local", "-pcvf"),
7373
UniversalDocs / packageXzTarball / universalArchiveOptions := Seq("--force-local", "-pcvf")
7474

@@ -84,7 +84,7 @@ object ScalaDist {
8484
private def scalaDistDep(v: String, config: String): ModuleID =
8585
"org.scala-lang" % "scala-dist" % v % s"${ScalaDistConfigName}; ${ScalaDistConfigName}->${config}"
8686

87-
// map module to the corresponding file mappings (unzipping scala-the / dist process)
87+
// map module to the corresponding file mappings (unzipping scala-dist in the process)
8888
private def universalMappings(id: ModuleID, artifact: Artifact, file: File): Seq[(File, String)] = id.name match {
8989
// scala-dist: explode (drop META-INF/)
9090
case "scala-dist" =>

0 commit comments

Comments
 (0)