diff options
| author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2022-09-22 13:32:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-22 13:32:17 +0200 |
| commit | a0250a5d8188fd539ffe516f7c49ce0eed1d3ded (patch) | |
| tree | 40d22072429088e552ad2b7fbe847e76e8a2c0ec /integration-tests/gradle/projects/serialization/serialization.diff | |
| parent | 879d4f2652d528f20c95d5bb17899d6cb10c5e85 (diff) | |
| download | dokka-a0250a5d8188fd539ffe516f7c49ce0eed1d3ded.tar.gz dokka-a0250a5d8188fd539ffe516f7c49ce0eed1d3ded.tar.bz2 dokka-a0250a5d8188fd539ffe516f7c49ce0eed1d3ded.zip | |
Update integration tests: coroutines, serialization, biojava (#2672)
Diffstat (limited to 'integration-tests/gradle/projects/serialization/serialization.diff')
| -rw-r--r-- | integration-tests/gradle/projects/serialization/serialization.diff | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/integration-tests/gradle/projects/serialization/serialization.diff b/integration-tests/gradle/projects/serialization/serialization.diff index 23ce9022..04783fb6 100644 --- a/integration-tests/gradle/projects/serialization/serialization.diff +++ b/integration-tests/gradle/projects/serialization/serialization.diff @@ -1,8 +1,8 @@ diff --git a/build.gradle b/build.gradle -index 845f7e4e..b3145969 100644 +index 0d21932a..4c5a9c7f 100644 --- a/build.gradle +++ b/build.gradle -@@ -64,7 +64,6 @@ buildscript { +@@ -63,7 +63,6 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" @@ -10,7 +10,7 @@ index 845f7e4e..b3145969 100644 classpath "org.jetbrains.kotlinx:kover:$kover_version" classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$validator_version" classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version" -@@ -79,6 +78,10 @@ buildscript { +@@ -77,6 +76,10 @@ buildscript { } } @@ -21,7 +21,7 @@ index 845f7e4e..b3145969 100644 // 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 -@@ -99,7 +102,6 @@ knit { +@@ -97,7 +100,6 @@ knit { // Build API docs for all modules with dokka before running Knit knitPrepare.dependsOn "dokka" @@ -29,32 +29,34 @@ index 845f7e4e..b3145969 100644 dependencies { dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") } -@@ -187,3 +189,5 @@ subprojects { +@@ -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 05428604..b4c7b3d1 100644 +index c4888992..d845be67 100644 --- a/gradle.properties +++ b/gradle.properties -@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.6.255-SNAPSHOT +@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.8.255-SNAPSHOT junit_version=4.12 jackson_version=2.10.0.pr1 --dokka_version=1.6.0 +-dokka_version=1.7.0 +dokka_version=for-integration-tests-SNAPSHOT native.deploy= - validator_version=0.7.1 + validator_version=0.10.1 knit_version=0.3.0 diff --git a/settings.gradle b/settings.gradle -index 27933950..6a6fc80a 100644 +index 01d4ea62..aa1800d6 100644 --- a/settings.gradle +++ b/settings.gradle -@@ -31,3 +31,5 @@ project(':benchmark').projectDir = file('./benchmark') +@@ -36,3 +36,5 @@ project(':benchmark').projectDir = file('./benchmark') include ':guide' project(':guide').projectDir = file('./guide') + -+apply from: "../template.settings.gradle.kts"
\ No newline at end of file ++apply from: "../template.settings.gradle.kts" |