Skip to content

Commit a0250a5

Browse files
IgnatBeresnevIgnatBeresnev
authored
Update integration tests: coroutines, serialization, biojava (#2672)
1 parent 879d4f2 commit a0250a5

File tree

8 files changed

+52
-58
lines changed

8 files changed

+52
-58
lines changed

‎integration-tests/gradle/projects/coroutines/coroutines.diff‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,59 @@
11
diff --git a/build.gradle b/build.gradle
2-
index 636a6f57f..57f0c6ea5 100644
2+
index ba6d5c18c..bd31bca29 100644
33
--- a/build.gradle
44
+++ b/build.gradle
5-
@@ -46,7 +46,6 @@ buildscript {
6-
mavenCentral()
7-
maven { url "https://plugins.gradle.org/m2/" }
8-
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
9-
- maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
10-
mavenLocal()
11-
}
12-
13-
@@ -126,7 +125,7 @@ allprojects {
5+
@@ -125,6 +125,7 @@ allprojects {
6+
* transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution
7+
*/
148
google()
9+
+ mavenLocal()
1510
mavenCentral()
1611
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
17-
- maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
18-
+ mavenLocal()
1912
}
20-
}
21-
2213
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
23-
index 8517a5aee..038be4089 100644
14+
index eaa03f2f1..deae8d40d 100644
2415
--- a/buildSrc/build.gradle.kts
2516
+++ b/buildSrc/build.gradle.kts
26-
@@ -19,7 +19,7 @@ repositories {
17+
@@ -19,6 +19,7 @@ repositories {
2718
maven("https://plugins.gradle.org/m2")
2819
}
2920
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
30-
- maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
3121
+ mavenLocal()
3222
if (buildSnapshotTrain) {
3323
mavenLocal()
3424
}
3525
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
36-
index e30c3ee59..80163ff95 100644
26+
index c2e859f65..80163ff95 100644
3727
--- a/buildSrc/settings.gradle.kts
3828
+++ b/buildSrc/settings.gradle.kts
39-
@@ -4,7 +4,7 @@
29+
@@ -4,6 +4,7 @@
4030
pluginManagement {
4131
val build_snapshot_train: String? by settings
4232
repositories {
43-
- maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
4433
+ mavenLocal()
4534
val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
4635
if (cacheRedirectorEnabled) {
4736
println("Redirecting repositories for buildSrc buildscript")
4837
diff --git a/gradle.properties b/gradle.properties
49-
index fdd63662d..237da9e03 100644
38+
index e452a07ee..471285c20 100644
5039
--- a/gradle.properties
5140
+++ b/gradle.properties
52-
@@ -14,7 +14,7 @@ atomicfu_version=0.17.0
53-
knit_version=0.3.0
41+
@@ -14,7 +14,7 @@ atomicfu_version=0.17.3
42+
knit_version=0.4.0
5443
html_version=0.7.2
5544
lincheck_version=2.14
56-
-dokka_version=1.6.0-dev-138
45+
-dokka_version=1.6.21
5746
+dokka_version=for-integration-tests-SNAPSHOT
5847
byte_buddy_version=1.10.9
5948
reactor_version=3.4.1
6049
reactive_streams_version=1.0.3
6150
diff --git a/settings.gradle b/settings.gradle
62-
index d7673a64f..03d929e63 100644
51+
index f0a764898..1cc45fdf6 100644
6352
--- a/settings.gradle
6453
+++ b/settings.gradle
6554
@@ -12,7 +12,7 @@ pluginManagement {
6655
}
67-
56+
6857
repositories {
6958
- maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
7059
+ mavenLocal()

‎integration-tests/gradle/projects/coroutines/kotlinx-coroutines‎

Submodule kotlinx-coroutines updated 239 files

‎integration-tests/gradle/projects/serialization/kotlinx-serialization‎

‎integration-tests/gradle/projects/serialization/serialization.diff‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/build.gradle b/build.gradle
2-
index 845f7e4e..b3145969 100644
2+
index 0d21932a..4c5a9c7f 100644
33
--- a/build.gradle
44
+++ b/build.gradle
5-
@@ -64,7 +64,6 @@ buildscript {
5+
@@ -63,7 +63,6 @@ buildscript {
66
dependencies {
77
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
88
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
99
- classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
1010
classpath "org.jetbrains.kotlinx:kover:$kover_version"
1111
classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$validator_version"
1212
classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
13-
@@ -79,6 +78,10 @@ buildscript {
13+
@@ -77,6 +76,10 @@ buildscript {
1414
}
1515
}
1616

@@ -21,40 +21,42 @@ index 845f7e4e..b3145969 100644
2121
// To make it visible for compiler-version.gradle
2222
ext.compilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION
2323
ext.nativeDebugBuild = org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType.DEBUG
24-
@@ -99,7 +102,6 @@ knit {
24+
@@ -97,7 +100,6 @@ knit {
2525
// Build API docs for all modules with dokka before running Knit
2626
knitPrepare.dependsOn "dokka"
2727

2828
-apply plugin: 'org.jetbrains.dokka'
2929
dependencies {
3030
dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
3131
}
32-
@@ -187,3 +189,5 @@ subprojects {
32+
@@ -188,6 +190,7 @@ subprojects {
3333
apply from: rootProject.file('gradle/compiler-version.gradle')
3434
apply from: rootProject.file("gradle/dokka.gradle")
3535
apply from: rootProject.file("gradle/benchmark-parsing.gradle")
3636
+apply from: "../template.root.gradle.kts"
37-
+
37+
38+
tasks.named("dokkaHtmlMultiModule") {
39+
pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "templatesDir": "${projectDir.toString().replace('\\', '/')}/dokka-templates" }"""])
3840
diff --git a/gradle.properties b/gradle.properties
39-
index 05428604..b4c7b3d1 100644
41+
index c4888992..d845be67 100644
4042
--- a/gradle.properties
4143
+++ b/gradle.properties
42-
@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.6.255-SNAPSHOT
44+
@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.8.255-SNAPSHOT
4345

4446
junit_version=4.12
4547
jackson_version=2.10.0.pr1
46-
-dokka_version=1.6.0
48+
-dokka_version=1.7.0
4749
+dokka_version=for-integration-tests-SNAPSHOT
4850
native.deploy=
49-
validator_version=0.7.1
51+
validator_version=0.10.1
5052
knit_version=0.3.0
5153
diff --git a/settings.gradle b/settings.gradle
52-
index 27933950..6a6fc80a 100644
54+
index 01d4ea62..aa1800d6 100644
5355
--- a/settings.gradle
5456
+++ b/settings.gradle
55-
@@ -31,3 +31,5 @@ project(':benchmark').projectDir = file('./benchmark')
57+
@@ -36,3 +36,5 @@ project(':benchmark').projectDir = file('./benchmark')
5658

5759
include ':guide'
5860
project(':guide').projectDir = file('./guide')
5961
+
60-
+apply from: "../template.settings.gradle.kts"
62+
+apply from: "../template.settings.gradle.kts"

‎integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class CoroutinesGradleIntegrationTest(override val versions: BuildVersions) : Ab
1515
@get:JvmStatic
1616
@get:Parameterized.Parameters(name = "{0}")
1717
val versions = BuildVersions.permutations(
18-
gradleVersions = listOf("6.9.1"),
19-
kotlinVersions = listOf("1.6.10")
18+
gradleVersions = listOf("7.4.2"),
19+
kotlinVersions = listOf("1.7.10")
2020
)
2121
}
2222

‎integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class SerializationGradleIntegrationTest(override val versions: BuildVersions) :
1515
@get:JvmStatic
1616
@get:Parameterized.Parameters(name = "{0}")
1717
val versions = BuildVersions.permutations(
18-
gradleVersions = listOf("6.9.1"),
19-
kotlinVersions = listOf("1.6.10")
18+
gradleVersions = listOf("7.4.2"),
19+
kotlinVersions = listOf("1.7.10")
2020
)
2121
}
2222

‎integration-tests/maven/projects/biojava/biojava‎

Submodule biojava updated 445 files

‎integration-tests/maven/projects/biojava/biojava.diff‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
2-
index 6cc9c6c9a..ef4f28225 100644
3-
--- a/biojava-core/pom.xml
4-
+++ b/biojava-core/pom.xml
5-
@@ -26,9 +26,40 @@
1+
diff --git a/pom.xml b/pom.xml
2+
index 7e3e806d1..765b6dea3 100644
3+
--- a/pom.xml
4+
+++ b/pom.xml
5+
@@ -31,6 +31,24 @@
6+
<distribution>repo</distribution>
67
</license>
78
</licenses>
8-
99
+ <pluginRepositories>
1010
+ <pluginRepository>
1111
+ <id>kotlin-dev</id>
@@ -24,10 +24,13 @@ index 6cc9c6c9a..ef4f28225 100644
2424
+ <url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/</url>
2525
+ </pluginRepository>
2626
+ </pluginRepositories>
27-
+
28-
<build>
27+
<properties>
28+
<!-- 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"-->
29+
<jdk.version>1.8</jdk.version>
30+
@@ -338,6 +356,19 @@
31+
32+
2933
<plugins>
30-
-
3134
+ <plugin>
3235
+ <groupId>org.jetbrains.dokka</groupId>
3336
+ <artifactId>dokka-maven-plugin</artifactId>
@@ -41,6 +44,6 @@ index 6cc9c6c9a..ef4f28225 100644
4144
+ </execution>
4245
+ </executions>
4346
+ </plugin>
44-
<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47+
48+
<!-- give more memory for junit tests -->
49+
<plugin>

0 commit comments

Comments
 (0)