Skip to content

Commit 969fb48

Browse files
SethTisueSethTisue
authored
Merge pull request #207 from lightbend/root-project
Make the plugin the root project
2 parents 1bfc9c2 + 752fe7b commit 969fb48

File tree

97 files changed

+3
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3
-8
lines changed

‎build.sbt

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@ val scalaMajorVersion = SettingKey[Int]("scalaMajorVersion")
44
val saveTestClasspath = taskKey[File](
55
"Saves test classpath to a file so that it can be used by embedded scalac in tests")
66

7-
lazy val genjavadoc = (project in file("."))
8-
.aggregate(`genjavadoc-plugin`)
9-
.settings(defaults)
10-
.settings(
11-
publishArtifact := false
12-
)
13-
14-
lazy val `genjavadoc-plugin` = (project in file("plugin"))
7+
lazy val root = (project in file("."))
158
.settings(defaults)
169
.settings(
10+
name := "genjavadoc-plugin",
11+
scalaMajorVersion := CrossVersion.partialVersion(scalaVersion.value).get._2.toInt,
1712
libraryDependencies ++= Seq(
1813
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
1914
"junit" % "junit" % "4.12" % Test,

‎plugin/src/main/resources/scalac-plugin.xml renamed to ‎src/main/resources/scalac-plugin.xml

File renamed without changes.

‎plugin/src/main/scala-2.11/com/typesafe/genjavadoc/Comments.scala renamed to ‎src/main/scala-2.11/com/typesafe/genjavadoc/Comments.scala

File renamed without changes.

‎plugin/src/main/scala-2.11/com/typesafe/genjavadoc/NeedsJavaSig.scala renamed to ‎src/main/scala-2.11/com/typesafe/genjavadoc/NeedsJavaSig.scala

File renamed without changes.

‎plugin/src/main/scala-2.12/com/typesafe/genjavadoc/Comments.scala renamed to ‎src/main/scala-2.12/com/typesafe/genjavadoc/Comments.scala

File renamed without changes.

‎plugin/src/main/scala-2.12/com/typesafe/genjavadoc/NeedsJavaSig.scala renamed to ‎src/main/scala-2.12/com/typesafe/genjavadoc/NeedsJavaSig.scala

File renamed without changes.

‎plugin/src/main/scala-2.13/com/typesafe/genjavadoc/Comments.scala renamed to ‎src/main/scala-2.13/com/typesafe/genjavadoc/Comments.scala

File renamed without changes.

‎plugin/src/main/scala-2.13/com/typesafe/genjavadoc/NeedsJavaSig.scala renamed to ‎src/main/scala-2.13/com/typesafe/genjavadoc/NeedsJavaSig.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/AST.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/AST.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/BaseComments.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/BaseComments.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/BasicTransform.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/BasicTransform.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/JavaSig.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/Output.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/Output.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/Plugin.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/Plugin.scala

File renamed without changes.

‎plugin/src/main/scala/com/typesafe/genjavadoc/TransformCake.scala renamed to ‎src/main/scala/com/typesafe/genjavadoc/TransformCake.scala

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/AtTheRoot.java renamed to ‎src/test/resources/expected_output/basic/AtTheRoot.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/Appl.java renamed to ‎src/test/resources/expected_output/basic/akka/Appl.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/Main$.java renamed to ‎src/test/resources/expected_output/basic/akka/Main$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/Main.java renamed to ‎src/test/resources/expected_output/basic/akka/Main.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/WithAnnotation.java renamed to ‎src/test/resources/expected_output/basic/akka/WithAnnotation.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/Identify$.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/Identify$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/Identify.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/Identify.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/TypedActor$.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/TypedActor$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/TypedActor$TypedActor.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/TypedActor$TypedActor.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/TypedActor.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/TypedActor.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/dsl/Inbox.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/dsl/Inbox.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/event/ManagedActorClassification.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/event/ManagedActorClassification.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/typed/DispatcherSelector$.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/typed/DispatcherSelector$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/typed/DispatcherSelector.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/typed/DispatcherSelector.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/actor/typed/Props.java renamed to ‎src/test/resources/expected_output/basic/akka/actor/typed/Props.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/A$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/A$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/A.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/A.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/AnAbstractTypeRef.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/AnAbstractTypeRef.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Blarb$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Blarb$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Blarb.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Blarb.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/ClassWithInner.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/ClassWithInner.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/DeprecatedNoComment.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/DeprecatedNoComment.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/DontTouchThis.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/DontTouchThis.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/EWMA$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/EWMA$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/EWMA.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/EWMA.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/PPrivate$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/PPrivate$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/PPrivate.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/PPrivate.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/PProtected$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/PProtected$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/PProtected.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/PProtected.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/PTrait.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/PTrait.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Private$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Private$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Private.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Private.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Reserved.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Reserved.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/ReservedImpl$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/ReservedImpl$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/ReservedImpl.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/ReservedImpl.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status$Status.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status$Status.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Status.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Trait$.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Trait$.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Trait.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Trait.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/X.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/X.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Y.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Y.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Z.java renamed to ‎src/test/resources/expected_output/basic/akka/rk/buh/is/it/Z.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/rangepos/akka/cluster/ClusterRouterGroupSettings.java renamed to ‎src/test/resources/expected_output/rangepos/akka/cluster/ClusterRouterGroupSettings.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/strict_visibility/org/example/Clazz.java renamed to ‎src/test/resources/expected_output/strict_visibility/org/example/Clazz.java

File renamed without changes.

‎plugin/src/test/resources/expected_output/strict_visibility/org/example/PublicClazz.java renamed to ‎src/test/resources/expected_output/strict_visibility/org/example/PublicClazz.java

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/Main.scala renamed to ‎src/test/resources/input/basic/akka/Main.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/WithAnnotation.scala renamed to ‎src/test/resources/input/basic/akka/WithAnnotation.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/actor/Actor.scala renamed to ‎src/test/resources/input/basic/akka/actor/Actor.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/actor/TypedActor.scala renamed to ‎src/test/resources/input/basic/akka/actor/TypedActor.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/actor/dsl/Inbox.scala renamed to ‎src/test/resources/input/basic/akka/actor/dsl/Inbox.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/actor/typed/Props.scala renamed to ‎src/test/resources/input/basic/akka/actor/typed/Props.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/akka/event/EventBus.scala renamed to ‎src/test/resources/input/basic/akka/event/EventBus.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/root.scala renamed to ‎src/test/resources/input/basic/root.scala

File renamed without changes.

‎plugin/src/test/resources/input/basic/test.scala renamed to ‎src/test/resources/input/basic/test.scala

File renamed without changes.

‎plugin/src/test/resources/input/rangepos/akka/cluster/ClusterRouterGroupSettings.scala renamed to ‎src/test/resources/input/rangepos/akka/cluster/ClusterRouterGroupSettings.scala

File renamed without changes.

‎plugin/src/test/resources/input/strict_visibility/test.scala renamed to ‎src/test/resources/input/strict_visibility/test.scala

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.0.patch renamed to ‎src/test/resources/patches/2.12.0.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.1.patch renamed to ‎src/test/resources/patches/2.12.1.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.10.patch renamed to ‎src/test/resources/patches/2.12.10.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.11.patch renamed to ‎src/test/resources/patches/2.12.11.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.2.patch renamed to ‎src/test/resources/patches/2.12.2.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.3.patch renamed to ‎src/test/resources/patches/2.12.3.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.4.patch renamed to ‎src/test/resources/patches/2.12.4.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.5.patch renamed to ‎src/test/resources/patches/2.12.5.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.6.patch renamed to ‎src/test/resources/patches/2.12.6.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.7.patch renamed to ‎src/test/resources/patches/2.12.7.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.8.patch renamed to ‎src/test/resources/patches/2.12.8.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.12.9.patch renamed to ‎src/test/resources/patches/2.12.9.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.13.0.patch renamed to ‎src/test/resources/patches/2.13.0.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.13.1.patch renamed to ‎src/test/resources/patches/2.13.1.patch

File renamed without changes.

‎plugin/src/test/resources/patches/2.13.2.patch renamed to ‎src/test/resources/patches/2.13.2.patch

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/BasicSpec.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/BasicSpec.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/RangePosSpec.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/RangePosSpec.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/StrictVisibilityTest.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/StrictVisibilityTest.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/util/CompilerSpec.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/util/CompilerSpec.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/util/GenJavaDocCompiler.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/util/GenJavaDocCompiler.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/util/IO.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/util/IO.scala

File renamed without changes.

‎plugin/src/test/scala/com/typesafe/genjavadoc/util/JavaCompiler.scala renamed to ‎src/test/scala/com/typesafe/genjavadoc/util/JavaCompiler.scala

File renamed without changes.

0 commit comments

Comments
 (0)