diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 07:11:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 07:11:46 +0000 |
| commit | 8cf3bac4c29ba5650df351b3d3ab5d96e5ca381a (patch) | |
| tree | 4e71ec8328040d8d5661c2fad6fbae68c4e63a67 | |
| parent | de53bac1f8b51b93a2cf9fae7c424f2e158a6de6 (diff) | |
| parent | b6a894185cf341bb4f01d760893bacee6b6ab4df (diff) | |
| download | dokka-android11-mainline-sparse-2020-dec-release.tar.gz | |
Snap for 6517089 from b6a894185cf341bb4f01d760893bacee6b6ab4df to mainline-releaser_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-release
Change-Id: Ie9073bbaea80400dfe00dbbcf7b8dae8d013e11b
31 files changed, 62 insertions, 253 deletions
@@ -7,6 +7,7 @@ third_party { type: GIT value: "https://github.com/Kotlin/dokka.git" } + license_type: NOTICE last_upgrade_date { year: 2019 month: 7 diff --git a/busytown.gradle b/busytown.gradle index f16d8539a..1b9a7119f 100644 --- a/busytown.gradle +++ b/busytown.gradle @@ -23,8 +23,16 @@ allprojects { project -> destinationDir destDir archiveName = "maven.zip" } - zipMaven.dependsOn(":runners:android-gradle-plugin:publishToDistMaven") - zipMaven.dependsOn(":runners:gradle-plugin:publishToDistMaven") - zipMaven.dependsOn(":runners:fatjar:publishToDistMaven") + + def copyRepository = project.tasks.create("copyRepository", Copy) { + from file("${project.buildDir}/dist-maven") + into "${destDir}/repository" + } + + [copyRepository, zipMaven].forEach { + it.dependsOn(":runners:android-gradle-plugin:publishToDistMaven") + it.dependsOn(":runners:gradle-plugin:publishToDistMaven") + it.dependsOn(":runners:fatjar:publishToDistMaven") + } } } diff --git a/busytown.sh b/busytown.sh index d99bdfe91..ca1ae6199 100755 --- a/busytown.sh +++ b/busytown.sh @@ -3,4 +3,4 @@ set -e SCRIPT_DIR="$(cd $(dirname $0) && pwd)" -"$SCRIPT_DIR"/gradlew -p "$SCRIPT_DIR" -I "$SCRIPT_DIR"/busytown.gradle --no-daemon :core:build :runners:android-gradle-plugin:build :runners:gradle-integration-tests:build zipMaven
\ No newline at end of file +"$SCRIPT_DIR"/gradlew -p "$SCRIPT_DIR" -I "$SCRIPT_DIR"/busytown.gradle --no-daemon :core:build :runners:android-gradle-plugin:build :runners:gradle-integration-tests:build zipMaven copyRepository
\ No newline at end of file diff --git a/core/src/main/kotlin/Formats/DacHtmlFormat.kt b/core/src/main/kotlin/Formats/DacHtmlFormat.kt index b767c7d6f..7038a7fbe 100644 --- a/core/src/main/kotlin/Formats/DacHtmlFormat.kt +++ b/core/src/main/kotlin/Formats/DacHtmlFormat.kt @@ -9,7 +9,6 @@ import org.jetbrains.dokka.Kotlin.ParameterInfoNode import org.jetbrains.dokka.Utilities.firstSentence import java.lang.Math.max import java.net.URI -import java.util.Collections.emptyMap import kotlin.reflect.KClass /** @@ -481,7 +480,7 @@ class DevsiteLayoutHtmlFormatOutputBuilder( id = summaryId tbody { if (headerAsRow) { - developerHeading(header, summaryId) + developerHeading(header) } nodes.forEach { node -> row(node) @@ -919,25 +918,11 @@ class DevsiteLayoutHtmlFormatOutputBuilder( } } -fun TBODY.developerHeading( - header: String, - summaryId: String? = null -) { +fun TBODY.developerHeading(header: String) { tr { th { attributes["colSpan"] = "2" - dheading { - attributes["ds-is"] = "heading" - attributes["text"] = header - attributes["id"] = summaryId ?: header.replace("\\s".toRegex(), "-").toLowerCase() - attributes["level"] = "h3" - attributes["toc"] = "" - attributes["class"] = "" - h3 { - attributes["is-upgraded"] = "" - +header - } - } + +header } } } @@ -961,8 +946,3 @@ class DacAsJavaFormatDescriptor : JavaLayoutHtmlFormatDescriptorBase(), DefaultA override val packageListServiceClass: KClass<out PackageListService> = JavaLayoutHtmlPackageListService::class override val outputBuilderFactoryClass: KClass<out JavaLayoutHtmlFormatOutputBuilderFactory> = DevsiteLayoutHtmlFormatOutputBuilderFactoryImpl::class } - -fun FlowOrPhrasingContent.dheading(block : DHEADING.() -> Unit = {}) : Unit = DHEADING(consumer).visit(block) - -class DHEADING(consumer: TagConsumer<*>) : - HTMLTag("devsite-heading", consumer, emptyMap(), inlineTag = false, emptyTag = false), HtmlBlockTag diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html index 483929564..d77fa9e64 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html index 71da6a1e8..56283f6e5 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html index 8cf0c575d..e7e2fecb0 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html index b07ac3cc9..c898800da 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a></td> diff --git a/core/testdata/format/dac/deprecation/dac/Bar.html b/core/testdata/format/dac/deprecation/dac/Bar.html index 8b3e6c3fc..f20112e16 100644 --- a/core/testdata/format/dac/deprecation/dac/Bar.html +++ b/core/testdata/format/dac/deprecation/dac/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td> diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html index 09758f061..15be9a06e 100644 --- a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html +++ b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html index 16974894f..610c46b60 100644 --- a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html +++ b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/deprecation/dac/Foo.html b/core/testdata/format/dac/deprecation/dac/Foo.html index 7dcc84289..76c0760a0 100644 --- a/core/testdata/format/dac/deprecation/dac/Foo.html +++ b/core/testdata/format/dac/deprecation/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></td> 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 a66d0bf6c..67a58125a 100644 --- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html +++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html @@ -21,11 +21,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -38,11 +34,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="identifier">void</span></td> 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 4efddeb30..dd305f7f8 100644 --- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html +++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html @@ -38,11 +38,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -55,11 +51,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="identifier">void</span></td> diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html index 5da7f475d..dff52afbe 100644 --- a/core/testdata/format/dac/inheritedMethods/dac/Child.html +++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html @@ -21,11 +21,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -38,11 +34,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> @@ -63,11 +55,7 @@ <table class="responsive" id="inhmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Inherited functions" id="inherited-functions" level="h3" toc="" class=""> - <h3 is-upgraded="">Inherited functions</h3> - </devsite-heading> - </th> + <th colSpan="2">Inherited functions</th> </tr> <tr class="api apilevel-"> <td colSpan="2"> diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html index 0023368f0..ff9048b96 100644 --- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html +++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html @@ -38,11 +38,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -55,11 +51,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html index 3d247edb8..cbabc2920 100644 --- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html +++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><a href="Foo.html#"><span class="identifier">Foo</span></a></td> diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html index 5717ecf6b..0ae4d255b 100644 --- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaClassLinks/dac/Bar.html b/core/testdata/format/dac/javaClassLinks/dac/Bar.html index 0c0c36714..87f2c3adf 100644 --- a/core/testdata/format/dac/javaClassLinks/dac/Bar.html +++ b/core/testdata/format/dac/javaClassLinks/dac/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <a href="Foo.html#"><span class="identifier">Foo</span></a><span class="symbol">!</span></td> diff --git a/core/testdata/format/dac/javaClassLinks/dac/Foo.html b/core/testdata/format/dac/javaClassLinks/dac/Foo.html index dc7637b6a..51ba0204c 100644 --- a/core/testdata/format/dac/javaClassLinks/dac/Foo.html +++ b/core/testdata/format/dac/javaClassLinks/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html index 5717ecf6b..0ae4d255b 100644 --- a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaConstructor/dac/Foo.html b/core/testdata/format/dac/javaConstructor/dac/Foo.html index dc7637b6a..51ba0204c 100644 --- a/core/testdata/format/dac/javaConstructor/dac/Foo.html +++ b/core/testdata/format/dac/javaConstructor/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html index 5717ecf6b..0ae4d255b 100644 --- a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html index dc7637b6a..51ba0204c 100644 --- a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html +++ b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html index 7f494c467..1ed04c547 100644 --- a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="identifier">void</span></td> @@ -52,11 +44,7 @@ <table class="responsive" id="promethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Protected methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Protected methods</th> </tr> <tr> <td><span class="identifier">void</span></td> @@ -70,11 +58,7 @@ <table class="responsive" id="primethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Private methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Private methods</th> </tr> <tr> <td><span class="identifier">void</span></td> diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html index 3f1e45107..0bcdcae90 100644 --- a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html +++ b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> @@ -52,11 +44,7 @@ <table class="responsive" id="promethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Protected methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Protected methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> @@ -70,11 +58,7 @@ <table class="responsive" id="primethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Private methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Private methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html index 663d14727..6b4d75f4a 100644 --- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html +++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html index 6a6b5045c..b9f23dc59 100644 --- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="identifier">void</span></td> diff --git a/core/testdata/format/dac/javaSeeTag/dac/Bar.html b/core/testdata/format/dac/javaSeeTag/dac/Bar.html index c49e6d808..10a5f59ed 100644 --- a/core/testdata/format/dac/javaSeeTag/dac/Bar.html +++ b/core/testdata/format/dac/javaSeeTag/dac/Bar.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> diff --git a/core/testdata/format/dac/javaSeeTag/dac/Foo.html b/core/testdata/format/dac/javaSeeTag/dac/Foo.html index 14a913c99..7ca410c06 100644 --- a/core/testdata/format/dac/javaSeeTag/dac/Foo.html +++ b/core/testdata/format/dac/javaSeeTag/dac/Foo.html @@ -17,11 +17,7 @@ <table class="responsive" id="pubctors"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class=""> - <h3 is-upgraded="">Public constructors</h3> - </devsite-heading> - </th> + <th colSpan="2">Public constructors</th> </tr> <tr> <td> @@ -34,11 +30,7 @@ <table class="responsive" id="pubmethods"> <tbody> <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class=""> - <h3 is-upgraded="">Public methods</h3> - </devsite-heading> - </th> + <th colSpan="2">Public methods</th> </tr> <tr> <td><span class="keyword">open</span> <span class="identifier">Unit</span></td> diff --git a/gradle.properties b/gradle.properties index 79056aa4c..a9e47b0bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -dokka_version=0.9.17-g010 +dokka_version=0.9.17-g011 dokka_publication_channel=dokka #Kotlin compiler and plugin |