diff options
8 files changed, 49 insertions, 55 deletions
diff --git a/integration-tests/gradle/projects/coroutines/coroutines.diff b/integration-tests/gradle/projects/coroutines/coroutines.diff index 5e55e3ab..239fb43a 100644 --- a/integration-tests/gradle/projects/coroutines/coroutines.diff +++ b/integration-tests/gradle/projects/coroutines/coroutines.diff @@ -1,70 +1,59 @@ diff --git a/build.gradle b/build.gradle -index 636a6f57f..57f0c6ea5 100644 +index ba6d5c18c..bd31bca29 100644 --- a/build.gradle +++ b/build.gradle -@@ -46,7 +46,6 @@ buildscript { - mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } -- maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' } - mavenLocal() - } - -@@ -126,7 +125,7 @@ allprojects { +@@ -125,6 +125,7 @@ allprojects { + * transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution + */ google() ++ mavenLocal() mavenCentral() maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } -- maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' } -+ mavenLocal() } - } - diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -index 8517a5aee..038be4089 100644 +index eaa03f2f1..deae8d40d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts -@@ -19,7 +19,7 @@ repositories { +@@ -19,6 +19,7 @@ repositories { maven("https://plugins.gradle.org/m2") } maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") -- maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev") + mavenLocal() if (buildSnapshotTrain) { mavenLocal() } diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts -index e30c3ee59..80163ff95 100644 +index c2e859f65..80163ff95 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts -@@ -4,7 +4,7 @@ +@@ -4,6 +4,7 @@ pluginManagement { val build_snapshot_train: String? by settings repositories { -- maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/") + mavenLocal() val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true if (cacheRedirectorEnabled) { println("Redirecting repositories for buildSrc buildscript") diff --git a/gradle.properties b/gradle.properties -index fdd63662d..237da9e03 100644 +index e452a07ee..471285c20 100644 --- a/gradle.properties +++ b/gradle.properties -@@ -14,7 +14,7 @@ atomicfu_version=0.17.0 - knit_version=0.3.0 +@@ -14,7 +14,7 @@ atomicfu_version=0.17.3 + knit_version=0.4.0 html_version=0.7.2 lincheck_version=2.14 --dokka_version=1.6.0-dev-138 +-dokka_version=1.6.21 +dokka_version=for-integration-tests-SNAPSHOT byte_buddy_version=1.10.9 reactor_version=3.4.1 reactive_streams_version=1.0.3 diff --git a/settings.gradle b/settings.gradle -index d7673a64f..03d929e63 100644 +index f0a764898..1cc45fdf6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,7 +12,7 @@ pluginManagement { } - + repositories { - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" } + mavenLocal() diff --git a/integration-tests/gradle/projects/coroutines/kotlinx-coroutines b/integration-tests/gradle/projects/coroutines/kotlinx-coroutines -Subproject 722cf5fd4359374dbbedfadf62af76e970f767b +Subproject d88a8c227a295f91251960c8fe6b21a02ddf704 diff --git a/integration-tests/gradle/projects/serialization/kotlinx-serialization b/integration-tests/gradle/projects/serialization/kotlinx-serialization -Subproject 8be6845927414a844ffebedc871dd8bc0d4b8ae +Subproject daa95c79ffadc0eedbbb4a481a00556b78212e4 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" diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt index 099046b0..0b727a29 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt @@ -15,8 +15,8 @@ class CoroutinesGradleIntegrationTest(override val versions: BuildVersions) : Ab @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.9.1"), - kotlinVersions = listOf("1.6.10") + gradleVersions = listOf("7.4.2"), + kotlinVersions = listOf("1.7.10") ) } 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 c05e80e6..126899b2 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("6.9.1"), - kotlinVersions = listOf("1.6.10") + gradleVersions = listOf("7.4.2"), + kotlinVersions = listOf("1.7.10") ) } diff --git a/integration-tests/maven/projects/biojava/biojava b/integration-tests/maven/projects/biojava/biojava -Subproject 633021b1cf6c1aafd45df2d94dc2ad6eadad398 +Subproject 059fbf1403d0704801df1427b0ec925102a645c diff --git a/integration-tests/maven/projects/biojava/biojava.diff b/integration-tests/maven/projects/biojava/biojava.diff index 8b27c4ff..5421e92f 100644 --- a/integration-tests/maven/projects/biojava/biojava.diff +++ b/integration-tests/maven/projects/biojava/biojava.diff @@ -1,11 +1,11 @@ -diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml -index 6cc9c6c9a..ef4f28225 100644 ---- a/biojava-core/pom.xml -+++ b/biojava-core/pom.xml -@@ -26,9 +26,40 @@ +diff --git a/pom.xml b/pom.xml +index 7e3e806d1..765b6dea3 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -31,6 +31,24 @@ + <distribution>repo</distribution> </license> </licenses> - + <pluginRepositories> + <pluginRepository> + <id>kotlin-dev</id> @@ -24,10 +24,13 @@ index 6cc9c6c9a..ef4f28225 100644 + <url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/</url> + </pluginRepository> + </pluginRepositories> -+ - <build> + <properties> + <!-- Notice: if using java 9 or 10 jres, it is possible to simply use here "8", "9" or "10". But if using java 8 jre, "8" is not an allowed value but only "1.8"--> + <jdk.version>1.8</jdk.version> +@@ -338,6 +356,19 @@ + + <plugins> -- + <plugin> + <groupId>org.jetbrains.dokka</groupId> + <artifactId>dokka-maven-plugin</artifactId> @@ -41,6 +44,6 @@ index 6cc9c6c9a..ef4f28225 100644 + </execution> + </executions> + </plugin> - <!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + + <!-- give more memory for junit tests --> + <plugin> |