Skip to content

Commit 0b56a74

Browse files
committed
Merge branch 'andrey/android-warnings' into andrey/maui-warnings
2 parents 1c7dd71 + 8bde69c commit 0b56a74

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

sdk/@launchdarkly/observability-android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
33

44
android.useAndroidX=true
5+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
56

67
#x-release-please-start-version
78
version=0.32.0

sdk/@launchdarkly/observability-android/lib/build.gradle.kts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ plugins {
99
alias(libs.plugins.kotlin.serialization)
1010

1111
// Apply Dokka plugin for documentation generation
12-
id("org.jetbrains.dokka") version "2.0.0"
12+
id("org.jetbrains.dokka") version "2.1.0"
13+
id("org.jetbrains.dokka-javadoc") version "2.1.0"
1314
}
1415

1516
allprojects {
@@ -106,8 +107,10 @@ android {
106107
sourceCompatibility = JavaVersion.VERSION_1_8
107108
targetCompatibility = JavaVersion.VERSION_1_8
108109
}
109-
kotlinOptions {
110-
jvmTarget = "1.8"
110+
kotlin {
111+
compilerOptions {
112+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
113+
}
111114
}
112115

113116
publishing {
@@ -177,15 +180,15 @@ signing {
177180
sign(publishing.publications["release"])
178181
}
179182

180-
// Dokka configuration for Android library documentation
181-
tasks.dokkaJavadoc.configure {
183+
dokka {
182184
moduleName.set("launchdarkly-observability-android")
183185
moduleVersion.set(project.version.toString())
184-
outputDirectory.set(layout.projectDirectory.dir("docs"))
185186

186-
dokkaSourceSets {
187-
configureEach {
188-
includes.from("doc-module.md")
189-
}
187+
dokkaPublications.javadoc {
188+
outputDirectory.set(layout.projectDirectory.dir("docs"))
189+
}
190+
191+
dokkaSourceSets.configureEach {
192+
includes.from("doc-module.md")
190193
}
191194
}

0 commit comments

Comments
 (0)