diff options
Diffstat (limited to 'integration-tests')
6 files changed, 42 insertions, 67 deletions
diff --git a/integration-tests/gradle/README.md b/integration-tests/gradle/README.md index 45828092..706cfb61 100644 --- a/integration-tests/gradle/README.md +++ b/integration-tests/gradle/README.md @@ -5,3 +5,17 @@ build.gradle.kts file -> "import gradle project". Before importing: Make sure that you have dokka installed locally (`./gradlew publishToMavenLocal`). + +### To update git submodules + +Integration tests have fixed git revision number, with the diff patch applied from the corresponding file (e.g. [`coroutines.diff`](projects/coroutines/coroutines.diff)). + +In order to update: + +* Checkout the project with the requered revision + - It's some state of the `master` +* Manually write the diff (or apply the existing one and tweak) to have the project buildable against locally published Dokka of version `for-integration-tests-SNAPSHOT` +* `git diff > $pathToProjectInDokka/project.diff` +* Go to `$pathToProjectInDokka`, `git fetch && git checkout $revisionNumber` + - Prior to that, ensure that you have your git submodules initialized +* Ensure that the corresponding `GradleIntegrationTest` passes locally and push diff --git a/integration-tests/gradle/projects/coroutines/coroutines.diff b/integration-tests/gradle/projects/coroutines/coroutines.diff index 4d95307c..d2216f1b 100644 --- a/integration-tests/gradle/projects/coroutines/coroutines.diff +++ b/integration-tests/gradle/projects/coroutines/coroutines.diff @@ -1,17 +1,27 @@ diff --git a/build.gradle b/build.gradle -index 934d4c220..38321990e 100644 +index e7d405e12..0ca2169fe 100644 --- a/build.gradle +++ b/build.gradle -@@ -131,6 +131,7 @@ allprojects { +@@ -107,6 +107,9 @@ allprojects { + mavenLocal() + } + } ++ repositories { ++ mavenLocal() ++ } + + ext.unpublished = unpublished + +@@ -142,6 +145,7 @@ allprojects { google() mavenCentral() CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project) + mavenLocal() } } - + diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -index 785d13fdb..7fb19f467 100644 +index ae54ad0f6..4655940a9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -25,6 +25,7 @@ repositories { @@ -20,8 +30,8 @@ index 785d13fdb..7fb19f467 100644 } + mavenLocal() } - - kotlinDslPluginOptions { + + val gradleProperties = Properties().apply { diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index c2e859f65..43dc4f749 100644 --- a/buildSrc/settings.gradle.kts @@ -34,14 +44,14 @@ index c2e859f65..43dc4f749 100644 } } diff --git a/gradle.properties b/gradle.properties -index db7cf099b..9c13c46fd 100644 +index 3d9431be0..b60114bc2 100644 --- a/gradle.properties +++ b/gradle.properties -@@ -14,7 +14,7 @@ atomicfu_version=0.18.5 - knit_version=0.4.0 +@@ -14,7 +14,7 @@ atomicfu_version=0.21.0 + knit_version=0.5.0-Beta html_version=0.7.2 - lincheck_version=2.14.1 --dokka_version=1.7.20 + lincheck_version=2.18.1 +-dokka_version=1.8.10 +dokka_version=for-integration-tests-SNAPSHOT byte_buddy_version=1.10.9 reactor_version=3.4.1 diff --git a/integration-tests/gradle/projects/coroutines/kotlinx-coroutines b/integration-tests/gradle/projects/coroutines/kotlinx-coroutines -Subproject b74e039196711512764add6f94af92f99d09d3a +Subproject b78bbf518bd8e90e9ed2133ebdacc36441210cd 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 diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt index 126899b2..ff929391 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt @@ -15,8 +15,8 @@ class SerializationGradleIntegrationTest(override val versions: BuildVersions) : @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("7.4.2"), - kotlinVersions = listOf("1.7.10") + gradleVersions = listOf("7.6.1"), + kotlinVersions = listOf("1.9.0") ) } |