From 2e121db75f8ce9387e149b771927045788737eef Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 31 Jan 2023 17:28:43 +0100 Subject: [PATCH] Use Dokka instead of Javadoc for Android API docs (#754) --- .github/workflows/gh-pages-android-api.yml | 24 +++++++------------ .../android/MapboxGLAndroidSDK/build.gradle | 1 + .../MapboxGLAndroidSDK/gradle.properties | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/gh-pages-android-api.yml b/.github/workflows/gh-pages-android-api.yml index 950a5a6ab..6f7be443e 100644 --- a/.github/workflows/gh-pages-android-api.yml +++ b/.github/workflows/gh-pages-android-api.yml @@ -1,32 +1,24 @@ name: gh-pages-android-api -on: +on: workflow_dispatch: - inputs: - version: - description: 'Version' - required: true - default: '9.5.2' jobs: gh-pages-android-api: + defaults: + run: + working-directory: platform/android runs-on: ubuntu-latest steps: - name: Checkout 🛎️ uses: actions/checkout@v3 - - name: Download javadoc from Maven - run: | - wget https://repo1.maven.org/maven2/org/maplibre/gl/android-sdk/${{ github.event.inputs.version }}/android-sdk-${{ github.event.inputs.version }}-javadoc.jar -O javadoc.zip - - - name: Unzip - run: | - mkdir unzipped/ - unzip javadoc.zip -d unzipped/ - + - name: Generate documentation + run: ./gradlew dokkaHtml + - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4.4.1 with: branch: gh-pages - folder: unzipped + folder: MapboxGLAndroidSDK/build/dokka/html target-folder: android/api/ diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 674a5a0f0..1dc8b50dd 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -1,5 +1,6 @@ plugins { id 'org.jmailen.kotlinter' + id 'org.jetbrains.dokka' version '1.7.20' } apply plugin: 'com.android.library' diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index cb3bea48c..64a99c96b 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=9.1.0-SNAPSHOT +VERSION_NAME=9.6.0 # Only build native dependencies for the current ABI # See https://code.google.com/p/android/issues/detail?id=221098#c20