-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix extraction of source <-> class mappings for Java
This was in the original, to-upstream source, but it got lost somewhere.
- Loading branch information
Showing
9 changed files
with
49 additions
and
1 deletion.
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
15 changes: 15 additions & 0 deletions
15
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json
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,15 @@ | ||
{ | ||
"projects": [ | ||
{ | ||
"name": "use", | ||
"dependsOn": [ | ||
"dep" | ||
], | ||
"scalaVersion": "2.13.3" | ||
}, | ||
{ | ||
"name": "dep", | ||
"scalaVersion": "2.13.3" | ||
} | ||
] | ||
} |
6 changes: 6 additions & 0 deletions
6
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/changes/B2.scala
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,6 @@ | ||
package example | ||
|
||
object B { | ||
val y = A.x + 1 | ||
def main(args: Array[String]): Unit = println(y) | ||
} |
5 changes: 5 additions & 0 deletions
5
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/changes/Other.scala
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,5 @@ | ||
package example | ||
|
||
object Other { | ||
def z = 1 | ||
} |
5 changes: 5 additions & 0 deletions
5
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/dep/A.java
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,5 @@ | ||
package example; | ||
|
||
public class A { | ||
public static int x() { return 3; } | ||
} |
1 change: 1 addition & 0 deletions
1
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/dep/incOptions.properties
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 @@ | ||
pipelining = true |
9 changes: 9 additions & 0 deletions
9
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/test
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,9 @@ | ||
# base-line | ||
> use/compile | ||
$ sleep 1000 | ||
|
||
# 1. make dep recompile something other than A | ||
# 2. make use recompile, needing a pickle for A | ||
$ copy-file changes/Other.scala dep/Other.scala | ||
$ copy-file changes/B2.scala use/B.scala | ||
> use/compile |
6 changes: 6 additions & 0 deletions
6
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/use/B.scala
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,6 @@ | ||
package example | ||
|
||
object B { | ||
val y = A.x | ||
def main(args: Array[String]): Unit = println(y) | ||
} |
1 change: 1 addition & 0 deletions
1
zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/use/incOptions.properties
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 @@ | ||
pipelining = true |