Skip to content

Commit a4e41b1

Browse files
0xnm0xnm
authored
Merge pull request #2766 from DataDog/nogorodnikov/rum-10575/bump-kotlin-to-2.0.21
RUM-10575: Bump Kotlin version used to 2.0.21
2 parents 3337e12 + 1cf2837 commit a4e41b1

File tree

62 files changed

+80
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+80
-101
lines changed

‎buildSrc/src/main/kotlin/com/datadog/gradle/config/JavadocConfig.kt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,16 @@
77
package com.datadog.gradle.config
88

99
import org.gradle.api.Project
10-
import org.jetbrains.dokka.gradle.DokkaTask
10+
import org.gradle.kotlin.dsl.configure
11+
import org.jetbrains.dokka.gradle.DokkaExtension
1112
import java.nio.file.Paths
1213

1314
fun Project.javadocConfig() {
14-
tasks.withType(DokkaTask::class.java).configureEach {
15-
val toOutputDirectory = layout.buildDirectory
16-
.dir(Paths.get("reports", "javadoc").toString())
17-
outputDirectory.set(toOutputDirectory)
18-
doFirst {
19-
toOutputDirectory.get().asFile.let {
20-
if (!it.exists()) {
21-
it.mkdirs()
22-
}
23-
}
15+
extensions.configure(DokkaExtension::class.java) {
16+
dokkaPublications.named("javadoc") {
17+
val toOutputDirectory = layout.buildDirectory
18+
.dir(Paths.get("reports", "javadoc").toString())
19+
outputDirectory.set(toOutputDirectory)
2420
}
2521
}
2622
}

‎dd-sdk-android-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525
// Publish
2626
`maven-publish`
2727
signing
28-
id("org.jetbrains.dokka")
28+
id("org.jetbrains.dokka-javadoc")
2929

3030
// Analysis tools
3131
id("com.github.ben-manes.versions")

‎dd-sdk-android-core/transitiveDependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
1818
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
1919
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
2020
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
21-
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
21+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
2222
org.jetbrains:annotations:13.0 : 17 Kb
2323

2424
Total transitive dependencies size : 5 Mb

‎dd-sdk-android-internal/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
// Publish
1717
`maven-publish`
1818
signing
19-
id("org.jetbrains.dokka")
19+
id("org.jetbrains.dokka-javadoc")
2020

2121
// Analysis tools
2222
id("com.github.ben-manes.versions")

‎dd-sdk-android-internal/transitiveDependencies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Dependencies List
22

3-
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
3+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
44
org.jetbrains:annotations:13.0 : 17 Kb
55

6-
Total transitive dependencies size : 1695 Kb
6+
Total transitive dependencies size : 1723 Kb
77

‎features/dd-sdk-android-logs/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
// Publish
2525
`maven-publish`
2626
signing
27-
id("org.jetbrains.dokka")
27+
id("org.jetbrains.dokka-javadoc")
2828

2929
// Analysis tools
3030
id("com.github.ben-manes.versions")

‎features/dd-sdk-android-logs/transitiveDependencies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Dependencies List
22

33
androidx.annotation:annotation-jvm:1.9.1 : 59 Kb
44
com.google.code.gson:gson:2.10.1 : 276 Kb
5-
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
5+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
66
org.jetbrains:annotations:13.0 : 17 Kb
77

8-
Total transitive dependencies size : 2031 Kb
8+
Total transitive dependencies size : 2 Mb
99

‎features/dd-sdk-android-ndk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
// Publish
2424
`maven-publish`
2525
signing
26-
id("org.jetbrains.dokka")
26+
id("org.jetbrains.dokka-javadoc")
2727

2828
// Analysis tools
2929
id("com.github.ben-manes.versions")

‎features/dd-sdk-android-ndk/transitiveDependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
55
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
66
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
77
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
8-
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
8+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
99
org.jetbrains:annotations:13.0 : 17 Kb
1010

1111
Total transitive dependencies size : 2 Mb

‎features/dd-sdk-android-rum/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
// Publish
2525
`maven-publish`
2626
signing
27-
id("org.jetbrains.dokka")
27+
id("org.jetbrains.dokka-javadoc")
2828

2929
// Analysis tools
3030
id("com.github.ben-manes.versions")

0 commit comments

Comments
 (0)