diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2016-05-31 15:23:04 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-07 17:10:36 +0200 |
commit | 09b2f39731386cd5b3688d5c3badf75d956d4f6d (patch) | |
tree | d122fc0e96d6c1cd22d7e0d0b5ee523563d534e7 /bridge/src/sbt-test/source-dependencies/resident-java/changes | |
parent | 030ff82070197f0c126f5c0287e076b0f6b6dd8d (diff) | |
download | dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.gz dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.bz2 dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.zip |
Make the dotty-bridge sbt project a subproject of dotty
Note that the dotty-bridge tests will not be run automatically by `test`
which is short for `dotty/test`, to run the dotty-bridge tests, do in sbt:
> dotty-bridge/test
> dotty-bridge/scripted
Original history: https://github.com/smarter/dotty-bridge/commits/master
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/resident-java/changes')
5 files changed, 17 insertions, 0 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java new file mode 100644 index 000000000..bdf223afb --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java @@ -0,0 +1,5 @@ +package example; + +public class A { + public final int x = 3; +} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java new file mode 100644 index 000000000..3b67c58d2 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java @@ -0,0 +1,5 @@ +package example; + +public class A { + public final String x = "a"; +} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala new file mode 100644 index 000000000..251ef7397 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala @@ -0,0 +1 @@ +object B diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala new file mode 100644 index 000000000..9d9a60c87 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala @@ -0,0 +1,3 @@ +object B { + val x: Int = (new example.A).x +} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala new file mode 100644 index 000000000..ec5fd2cf3 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala @@ -0,0 +1,3 @@ +object B { + val x: String = (new example.A).x +} |