Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Dokka to 2.0.0 #366

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/publish-dokka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,8 @@ jobs:
with:
ref: ${{ inputs.branch }}

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r26
add-to-path: false
link-to-sdk: true

- name: Build doc
run: gradle -Pandroid=true dokkaHtml
run: gradle dokkaHtml

- name: Deploy doc
if: ${{ inputs.live-run || false }}
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/publish-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ jobs:
distribution: temurin
java-version: 11

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r26
add-to-path: false
link-to-sdk: true

- name: Gradle Wrapper
run: |
gradle wrapper
Expand All @@ -202,7 +195,7 @@ jobs:
- if: ${{ inputs.maven_publish == true }}
name: Gradle Publish JVM Package to Maven Central repository
run: |
./gradlew publishJvmPublicationToSonatypeRepository ${{ env.RELEASE }} --info -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
./gradlew publishJvmPublicationToSonatypeRepository ${{ env.RELEASE }} --info -PremotePublication=true ${{ env.PUB_MODE }}
env:
ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
Expand All @@ -213,7 +206,7 @@ jobs:

- if: ${{ inputs.github_publish == true }}
name: Gradle Publish JVM Package to GitHub packages repository
run: ./gradlew publishJvmPublicationToGithubPackagesRepository ${{ env.RELEASE }} --info -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
run: ./gradlew publishJvmPublicationToGithubPackagesRepository ${{ env.RELEASE }} --info -PremotePublication=true ${{ env.PUB_MODE }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
.gradle
build/
examples/build
gradle.properties
gradle/
gradlew
gradlew.bat
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugins {
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
id("org.jetbrains.kotlin.multiplatform") version "1.9.0" apply false
id("org.mozilla.rust-android-gradle.rust-android") version "0.9.6" apply false
id("org.jetbrains.dokka") version "1.8.20" apply false
id("org.jetbrains.dokka") version "2.0.0" apply false
id("com.adarshr.test-logger") version "3.2.0" apply false
kotlin("plugin.serialization") version "1.9.0" apply false
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
2 changes: 1 addition & 1 deletion zenoh-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ kotlin {
}

val javadocJar by tasks.registering(Jar::class) {
dependsOn("dokkaHtml")
dependsOn("dokkaGeneratePublicationHtml")
archiveClassifier.set("javadoc")
from("${buildDir}/dokka/html")
}
Expand Down
Loading