Merge "Add support for Kotlin input in dac tests."
diff --git a/core/testdata/format/dac/inheritedMethods/Child.java b/core/testdata/format/dac/inheritedMethods/Child.java
index 6cc2e57..902f649 100644
--- a/core/testdata/format/dac/inheritedMethods/Child.java
+++ b/core/testdata/format/dac/inheritedMethods/Child.java
@@ -1,3 +1,8 @@
public class Child extends Parent {
public void Bar() { }
+ /**
+ * Do an override subclass baz
+ */
+ @override
+ public void baz() { }
}
\ No newline at end of file
diff --git a/core/testdata/format/dac/inheritedMethods/Parent.java b/core/testdata/format/dac/inheritedMethods/Parent.java
index 7ba30a7..59d9ab0 100644
--- a/core/testdata/format/dac/inheritedMethods/Parent.java
+++ b/core/testdata/format/dac/inheritedMethods/Parent.java
@@ -1,3 +1,10 @@
public class Parent {
+ /**
+ * Do a superclass foo
+ */
public void foo() { }
+ /**
+ * Do a superclass baz
+ */
+ public void baz() { }
}
\ No newline at end of file
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
index bfeabbc..a66d0bf 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
@@ -51,6 +51,13 @@
<p></p>
</td>
</tr>
+ <tr>
+ <td><span class="identifier">void</span></td>
+ <td>
+ <div><code><a href="#baz()">baz</a>()</code></div>
+ <p>Do an override subclass baz</p>
+ </td>
+ </tr>
</tbody>
</table>
<h2>Public constructors</h2>
@@ -65,5 +72,11 @@
<h3 class="api-name">Bar</h3>
<pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
</div>
+<a name="baz()"></a>
+ <div class="api apilevel-" data-version-added="">
+ <h3 class="api-name">baz</h3>
+ <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+ <p>Do an override subclass baz</p>
+ </div>
</body>
</html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
index 4e3ed94..4efddeb 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
@@ -64,8 +64,15 @@
<tr>
<td><span class="identifier">void</span></td>
<td>
+ <div><code><a href="#baz()">baz</a>()</code></div>
+ <p>Do a superclass baz</p>
+ </td>
+ </tr>
+ <tr>
+ <td><span class="identifier">void</span></td>
+ <td>
<div><code><a href="#foo()">foo</a>()</code></div>
- <p></p>
+ <p>Do a superclass foo</p>
</td>
</tr>
</tbody>
@@ -77,10 +84,17 @@
<pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Parent</span><span class="symbol">(</span><span class="symbol">)</span></pre>
</div>
<h2>Public methods</h2>
+<a name="baz()"></a>
+ <div class="api apilevel-" data-version-added="">
+ <h3 class="api-name">baz</h3>
+ <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+ <p>Do a superclass baz</p>
+ </div>
<a name="foo()"></a>
<div class="api apilevel-" data-version-added="">
<h3 class="api-name">foo</h3>
<pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+ <p>Do a superclass foo</p>
</div>
</body>
</html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html
index 77f0fe4..5da7f47 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html
@@ -51,6 +51,13 @@
<p></p>
</td>
</tr>
+ <tr>
+ <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
+ <td>
+ <div><code><a href="#baz()">baz</a>()</code></div>
+ <p>Do an override subclass baz</p>
+ </td>
+ </tr>
</tbody>
</table>
<table class="responsive" id="inhmethods">
@@ -70,7 +77,9 @@
<tr class="api apilevel-" data-version-added="ApiLevel:">
<td><code><span class="identifier">Unit</span></code></td>
<td width="100%"><code><a href="Parent.html#foo()">foo</a>()</code>
- <p></p>
+ <p>
+ <p>Do a superclass foo</p>
+ </p>
</td>
</tr>
</tbody>
@@ -92,5 +101,11 @@
<h3 class="api-name">Bar</h3>
<pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
</div>
+<a name="baz()"></a>
+ <div class="api apilevel-" data-version-added="">
+ <h3 class="api-name">baz</h3>
+ <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+ <p>Do an override subclass baz</p>
+ </div>
</body>
</html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
index 15c650e..0023368 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
@@ -64,8 +64,15 @@
<tr>
<td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
<td>
+ <div><code><a href="#baz()">baz</a>()</code></div>
+ <p>Do a superclass baz</p>
+ </td>
+ </tr>
+ <tr>
+ <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
+ <td>
<div><code><a href="#foo()">foo</a>()</code></div>
- <p></p>
+ <p>Do a superclass foo</p>
</td>
</tr>
</tbody>
@@ -77,10 +84,17 @@
<pre class="api-signature no-pretty-print"><span class="identifier">Parent</span><span class="symbol">(</span><span class="symbol">)</span></pre>
</div>
<h2>Public methods</h2>
+<a name="baz()"></a>
+ <div class="api apilevel-" data-version-added="">
+ <h3 class="api-name">baz</h3>
+ <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+ <p>Do a superclass baz</p>
+ </div>
<a name="foo()"></a>
<div class="api apilevel-" data-version-added="">
<h3 class="api-name">foo</h3>
<pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+ <p>Do a superclass foo</p>
</div>
</body>
</html>
diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 72d1be9..22403dc 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -38,6 +38,7 @@
}
processResources {
+ inputs.property("dokka_version", dokka_version)
eachFile {
if (it.name == "org.jetbrains.dokka-android.properties") {
it.filter { line ->
@@ -98,4 +99,4 @@
groupId = "org.jetbrains.dokka"
artifactId = "dokka-android-gradle-plugin"
}
-}
\ No newline at end of file
+}
diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle
index 661d432..a067080 100644
--- a/runners/gradle-plugin/build.gradle
+++ b/runners/gradle-plugin/build.gradle
@@ -35,6 +35,7 @@
}
processResources {
+ inputs.property("dokka_version", dokka_version)
eachFile {
if (it.name == "org.jetbrains.dokka.properties") {
it.filter { line ->
@@ -96,4 +97,4 @@
groupId = "org.jetbrains.dokka"
artifactId = "dokka-gradle-plugin"
}
-}
\ No newline at end of file
+}
diff --git a/runners/maven-plugin/build.gradle b/runners/maven-plugin/build.gradle
index 79a8c22..acd3415 100644
--- a/runners/maven-plugin/build.gradle
+++ b/runners/maven-plugin/build.gradle
@@ -33,6 +33,9 @@
task generatePom() {
inputs.file(new File(projectDir, "pom.tpl.xml"))
+ inputs.property("dokka_version", dokka_version)
+ inputs.property("maven_version", maven_version)
+ inputs.property("maven_plugin_tools_version", maven_plugin_tools_version)
outputs.file(new File(buildDir, "pom.xml"))
doLast {
final pomTemplate = new File(projectDir, "pom.tpl.xml")
