diff options
author | Vsevolod Tolstopyatov <qwwdfsad@gmail.com> | 2023-08-14 19:45:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-14 19:45:32 +0200 |
commit | 2269ac5e003b1cce90742b5f5ed9cd294dd099f4 (patch) | |
tree | b90bdab54c9ce0b144ed4485905e5257f174a58b /integration-tests/gradle/projects/serialization | |
parent | 2fd8e9096706545f8b77e1e66bcc876d7e29f82c (diff) | |
download | dokka-2269ac5e003b1cce90742b5f5ed9cd294dd099f4.tar.gz dokka-2269ac5e003b1cce90742b5f5ed9cd294dd099f4.tar.bz2 dokka-2269ac5e003b1cce90742b5f5ed9cd294dd099f4.zip |
Refactor and document DisplaySourceSet, deprecate SelfRepresentingSingletonSet (#3105)
* Deprecate internal API SelfRepresentingSingletonSet for removal as being harmful and unimplement it in DisplaySourceSet
* Provide no automatic migration for DisplaySourceSet, as there are no mechanisms for that. Manual migration is the replacement of 'dss' to `setOf(dss)` where applicable
* Introduce a convenience-member DefaultRenderer.buildContentNode to avoid wrapping DSS into set manually
* Document DisplaySourceSet
* Replace Iterable<DisplaySourceSet>.sourceSetIDs with more straightforward Iterable<DisplaySourceSet>.computeSourceSetIds(), refactor all the usages, save some allocations
* Start caching CompositeSourceSetID properties to avoid excessive allocations
* Update integration tests on the latest revision with Knit version where the workaround is applied
Fixes #2897
Diffstat (limited to 'integration-tests/gradle/projects/serialization')
m--------- | integration-tests/gradle/projects/serialization/kotlinx-serialization | 0 | ||||
-rw-r--r-- | integration-tests/gradle/projects/serialization/serialization.diff | 59 |
2 files changed, 5 insertions, 54 deletions
diff --git a/integration-tests/gradle/projects/serialization/kotlinx-serialization b/integration-tests/gradle/projects/serialization/kotlinx-serialization -Subproject daa95c79ffadc0eedbbb4a481a00556b78212e4 +Subproject ed1b05707ec27f8864c8b42235b299bdb5e0015 diff --git a/integration-tests/gradle/projects/serialization/serialization.diff b/integration-tests/gradle/projects/serialization/serialization.diff index 04783fb6..aac4a0c6 100644 --- a/integration-tests/gradle/projects/serialization/serialization.diff +++ b/integration-tests/gradle/projects/serialization/serialization.diff @@ -1,62 +1,13 @@ -diff --git a/build.gradle b/build.gradle -index 0d21932a..4c5a9c7f 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -63,7 +63,6 @@ buildscript { - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" -- classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath "org.jetbrains.kotlinx:kover:$kover_version" - classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$validator_version" - classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version" -@@ -77,6 +76,10 @@ buildscript { - } - } - -+plugins { -+ id("org.jetbrains.dokka") -+} -+ - // To make it visible for compiler-version.gradle - ext.compilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION - ext.nativeDebugBuild = org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType.DEBUG -@@ -97,7 +100,6 @@ knit { - // Build API docs for all modules with dokka before running Knit - knitPrepare.dependsOn "dokka" - --apply plugin: 'org.jetbrains.dokka' - dependencies { - dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") - } -@@ -188,6 +190,7 @@ subprojects { - apply from: rootProject.file('gradle/compiler-version.gradle') - apply from: rootProject.file("gradle/dokka.gradle") - apply from: rootProject.file("gradle/benchmark-parsing.gradle") -+apply from: "../template.root.gradle.kts" - - tasks.named("dokkaHtmlMultiModule") { - pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "templatesDir": "${projectDir.toString().replace('\\', '/')}/dokka-templates" }"""]) diff --git a/gradle.properties b/gradle.properties -index c4888992..d845be67 100644 +index 5ef66cd9..51a90924 100644 --- a/gradle.properties +++ b/gradle.properties -@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.8.255-SNAPSHOT +@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.9.255-SNAPSHOT junit_version=4.12 jackson_version=2.10.0.pr1 --dokka_version=1.7.0 +-dokka_version=1.8.10 +dokka_version=for-integration-tests-SNAPSHOT native.deploy= - validator_version=0.10.1 - knit_version=0.3.0 -diff --git a/settings.gradle b/settings.gradle -index 01d4ea62..aa1800d6 100644 ---- a/settings.gradle -+++ b/settings.gradle -@@ -36,3 +36,5 @@ project(':benchmark').projectDir = file('./benchmark') - - include ':guide' - project(':guide').projectDir = file('./guide') -+ -+apply from: "../template.settings.gradle.kts" + validator_version=0.13.2 + knit_version=0.5.0-Beta |