From 1c842b33410ada131ea65dd3c3f9cbbacc260629 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 30 May 2012 07:13:15 -0400 Subject: [PATCH] another variant of resident-java test from pvlugter --- .../source-dependencies/new-pkg-dep/changes/A1.java | 2 ++ .../source-dependencies/new-pkg-dep/changes/B0.scala | 2 ++ .../source-dependencies/new-pkg-dep/changes/B1.scala | 2 ++ sbt/src/sbt-test/source-dependencies/new-pkg-dep/test | 8 ++++++++ 4 files changed, 14 insertions(+) create mode 100644 sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java create mode 100644 sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala create mode 100644 sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala create mode 100644 sbt/src/sbt-test/source-dependencies/new-pkg-dep/test diff --git a/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java new file mode 100644 index 000000000..b448538ae --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java @@ -0,0 +1,2 @@ +package a; +public class A { public static final int x = 3; } diff --git a/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala new file mode 100644 index 000000000..ddeafd32d --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala @@ -0,0 +1,2 @@ +package b +object B { val x = 3 } diff --git a/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala new file mode 100644 index 000000000..6f0f9f967 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala @@ -0,0 +1,2 @@ +package b +object B { val x = a.A.x } diff --git a/sbt/src/sbt-test/source-dependencies/new-pkg-dep/test b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/test new file mode 100644 index 000000000..89251bcec --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/new-pkg-dep/test @@ -0,0 +1,8 @@ +$ copy-file changes/B0.scala B.scala +> compile + +$ copy-file changes/A1.java A.java +> compile + +$ copy-file changes/B1.scala B.scala +> compile