From b81a6cc2dac4fd24458594ec2a3aaf353fa51b70 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 1 Oct 2015 03:27:24 -0400 Subject: [PATCH] Fix scripted api tests --- .../basic/src/main/scala/testCase/FooUser.scala | 0 .../{api => apiinfo}/basic/src/main/scala/testCase/JFoo.java | 0 .../basic/src/main/scala/testCase/annotations.scala | 0 sbt/src/sbt-test/{api => apiinfo}/basic/test | 0 sbt/src/sbt-test/{api => apiinfo}/extracted/build.sbt | 0 sbt/src/sbt-test/{api => apiinfo}/extracted/test | 0 .../sbt-test/{api => apiinfo}/show-circular-structure/build.sbt | 2 +- .../show-circular-structure/src/main/java/test/J.java | 0 .../show-circular-structure/src/main/scala/A.scala | 0 sbt/src/sbt-test/{api => apiinfo}/show-circular-structure/test | 0 .../{api => apiinfo}/unstable-existential-names/build.sbt | 2 +- .../unstable-existential-names/changes/Foo1.scala | 0 .../unstable-existential-names/src/main/scala/Bar.scala | 0 .../unstable-existential-names/src/main/scala/Foo.scala | 0 .../sbt-test/{api => apiinfo}/unstable-existential-names/test | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename sbt/src/sbt-test/{api => apiinfo}/basic/src/main/scala/testCase/FooUser.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/basic/src/main/scala/testCase/JFoo.java (100%) rename sbt/src/sbt-test/{api => apiinfo}/basic/src/main/scala/testCase/annotations.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/basic/test (100%) rename sbt/src/sbt-test/{api => apiinfo}/extracted/build.sbt (100%) rename sbt/src/sbt-test/{api => apiinfo}/extracted/test (100%) rename sbt/src/sbt-test/{api => apiinfo}/show-circular-structure/build.sbt (76%) rename sbt/src/sbt-test/{api => apiinfo}/show-circular-structure/src/main/java/test/J.java (100%) rename sbt/src/sbt-test/{api => apiinfo}/show-circular-structure/src/main/scala/A.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/show-circular-structure/test (100%) rename sbt/src/sbt-test/{api => apiinfo}/unstable-existential-names/build.sbt (95%) rename sbt/src/sbt-test/{api => apiinfo}/unstable-existential-names/changes/Foo1.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/unstable-existential-names/src/main/scala/Bar.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/unstable-existential-names/src/main/scala/Foo.scala (100%) rename sbt/src/sbt-test/{api => apiinfo}/unstable-existential-names/test (100%) diff --git a/sbt/src/sbt-test/api/basic/src/main/scala/testCase/FooUser.scala b/sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/FooUser.scala similarity index 100% rename from sbt/src/sbt-test/api/basic/src/main/scala/testCase/FooUser.scala rename to sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/FooUser.scala diff --git a/sbt/src/sbt-test/api/basic/src/main/scala/testCase/JFoo.java b/sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/JFoo.java similarity index 100% rename from sbt/src/sbt-test/api/basic/src/main/scala/testCase/JFoo.java rename to sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/JFoo.java diff --git a/sbt/src/sbt-test/api/basic/src/main/scala/testCase/annotations.scala b/sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/annotations.scala similarity index 100% rename from sbt/src/sbt-test/api/basic/src/main/scala/testCase/annotations.scala rename to sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/annotations.scala diff --git a/sbt/src/sbt-test/api/basic/test b/sbt/src/sbt-test/apiinfo/basic/test similarity index 100% rename from sbt/src/sbt-test/api/basic/test rename to sbt/src/sbt-test/apiinfo/basic/test diff --git a/sbt/src/sbt-test/api/extracted/build.sbt b/sbt/src/sbt-test/apiinfo/extracted/build.sbt similarity index 100% rename from sbt/src/sbt-test/api/extracted/build.sbt rename to sbt/src/sbt-test/apiinfo/extracted/build.sbt diff --git a/sbt/src/sbt-test/api/extracted/test b/sbt/src/sbt-test/apiinfo/extracted/test similarity index 100% rename from sbt/src/sbt-test/api/extracted/test rename to sbt/src/sbt-test/apiinfo/extracted/test diff --git a/sbt/src/sbt-test/api/show-circular-structure/build.sbt b/sbt/src/sbt-test/apiinfo/show-circular-structure/build.sbt similarity index 76% rename from sbt/src/sbt-test/api/show-circular-structure/build.sbt rename to sbt/src/sbt-test/apiinfo/show-circular-structure/build.sbt index edcfebfd3..0d2d72459 100644 --- a/sbt/src/sbt-test/api/show-circular-structure/build.sbt +++ b/sbt/src/sbt-test/apiinfo/show-circular-structure/build.sbt @@ -2,7 +2,7 @@ logLevel := Level.Debug incOptions ~= { _.withApiDebug(true) } -TaskKey[Unit]("show-apis") <<= (compile in Compile, scalaSource in Compile, javaSource in Compile) map { (a: sbt.inc.Analysis, scalaSrc: java.io.File, javaSrc: java.io.File) => +TaskKey[Unit]("show-apis") <<= (compile in Compile, scalaSource in Compile, javaSource in Compile) map { (a: sbt.internal.inc.Analysis, scalaSrc: java.io.File, javaSrc: java.io.File) => val aApi = a.apis.internalAPI(scalaSrc / "A.scala").api val jApi = a.apis.internalAPI(javaSrc / "test/J.java").api import xsbt.api.DefaultShowAPI diff --git a/sbt/src/sbt-test/api/show-circular-structure/src/main/java/test/J.java b/sbt/src/sbt-test/apiinfo/show-circular-structure/src/main/java/test/J.java similarity index 100% rename from sbt/src/sbt-test/api/show-circular-structure/src/main/java/test/J.java rename to sbt/src/sbt-test/apiinfo/show-circular-structure/src/main/java/test/J.java diff --git a/sbt/src/sbt-test/api/show-circular-structure/src/main/scala/A.scala b/sbt/src/sbt-test/apiinfo/show-circular-structure/src/main/scala/A.scala similarity index 100% rename from sbt/src/sbt-test/api/show-circular-structure/src/main/scala/A.scala rename to sbt/src/sbt-test/apiinfo/show-circular-structure/src/main/scala/A.scala diff --git a/sbt/src/sbt-test/api/show-circular-structure/test b/sbt/src/sbt-test/apiinfo/show-circular-structure/test similarity index 100% rename from sbt/src/sbt-test/api/show-circular-structure/test rename to sbt/src/sbt-test/apiinfo/show-circular-structure/test diff --git a/sbt/src/sbt-test/api/unstable-existential-names/build.sbt b/sbt/src/sbt-test/apiinfo/unstable-existential-names/build.sbt similarity index 95% rename from sbt/src/sbt-test/api/unstable-existential-names/build.sbt rename to sbt/src/sbt-test/apiinfo/unstable-existential-names/build.sbt index 8bc82565f..c8a3bbc69 100644 --- a/sbt/src/sbt-test/api/unstable-existential-names/build.sbt +++ b/sbt/src/sbt-test/apiinfo/unstable-existential-names/build.sbt @@ -1,6 +1,6 @@ // checks number of compilation iterations performed since last `clean` run InputKey[Unit]("check-number-of-compiler-iterations") <<= inputTask { (argTask: TaskKey[Seq[String]]) => - (argTask, compile in Compile) map { (args: Seq[String], a: sbt.inc.Analysis) => + (argTask, compile in Compile) map { (args: Seq[String], a: sbt.internal.inc.Analysis) => assert(args.size == 1) val expectedIterationsNumber = args(0).toInt val allCompilationsSize = a.compilations.allCompilations.size diff --git a/sbt/src/sbt-test/api/unstable-existential-names/changes/Foo1.scala b/sbt/src/sbt-test/apiinfo/unstable-existential-names/changes/Foo1.scala similarity index 100% rename from sbt/src/sbt-test/api/unstable-existential-names/changes/Foo1.scala rename to sbt/src/sbt-test/apiinfo/unstable-existential-names/changes/Foo1.scala diff --git a/sbt/src/sbt-test/api/unstable-existential-names/src/main/scala/Bar.scala b/sbt/src/sbt-test/apiinfo/unstable-existential-names/src/main/scala/Bar.scala similarity index 100% rename from sbt/src/sbt-test/api/unstable-existential-names/src/main/scala/Bar.scala rename to sbt/src/sbt-test/apiinfo/unstable-existential-names/src/main/scala/Bar.scala diff --git a/sbt/src/sbt-test/api/unstable-existential-names/src/main/scala/Foo.scala b/sbt/src/sbt-test/apiinfo/unstable-existential-names/src/main/scala/Foo.scala similarity index 100% rename from sbt/src/sbt-test/api/unstable-existential-names/src/main/scala/Foo.scala rename to sbt/src/sbt-test/apiinfo/unstable-existential-names/src/main/scala/Foo.scala diff --git a/sbt/src/sbt-test/api/unstable-existential-names/test b/sbt/src/sbt-test/apiinfo/unstable-existential-names/test similarity index 100% rename from sbt/src/sbt-test/api/unstable-existential-names/test rename to sbt/src/sbt-test/apiinfo/unstable-existential-names/test