From 6b287bb3185d17e1274fe6b1a87493a58cdabc0a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 2 Nov 2026 03:12:32 +0600 Subject: [PATCH] ci: use the Android API 37.0 SDK package layout --- .github/workflows/build.yml | 2 +- .github/workflows/kdocs.yml | 2 +- DEVELOPMENT.md | 2 ++ MIGRATION_REPORT.md | 3 +-- plugins/dokka/src/RunDokka.kt | 6 ++++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e61bfe..129eeb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: with: packages: platform-tools - name: Install the declared Android SDK - run: sdkmanager "platforms;android-37" "build-tools;37.0.0" + run: sdkmanager "platforms;android-37.0" "build-tools;37.0.0" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ~/.cache/JetBrains/Kotlin diff --git a/.github/workflows/kdocs.yml b/.github/workflows/kdocs.yml index 274663d..96060ff 100644 --- a/.github/workflows/kdocs.yml +++ b/.github/workflows/kdocs.yml @@ -33,7 +33,7 @@ jobs: with: packages: platform-tools - name: Install the declared Android SDK - run: sdkmanager "platforms;android-37" "build-tools;37.0.0" + run: sdkmanager "platforms;android-37.0" "build-tools;37.0.0" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ~/.cache/JetBrains/Kotlin diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index c6dc50c..ea32444 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -4,6 +4,8 @@ - JDK 17 - Android SDK platform 37 and build tools 37.0.0 + (`sdkmanager` package IDs: `platforms;android-37.0` and `build-tools;37.0.0`; + the library's `compileSdk` remains 37) - Git - Bash and Python 3 for the committed compatibility verifiers diff --git a/MIGRATION_REPORT.md b/MIGRATION_REPORT.md index 6a6d2c3..5a1bdec 100644 --- a/MIGRATION_REPORT.md +++ b/MIGRATION_REPORT.md @@ -232,11 +232,10 @@ capabilities or an explicitly reviewed compatibility implementation is added. that artifact and deploys it to `kdocs`; project/plugin code never runs with a write credential. - All workflow actions are pinned to resolved commit SHAs. -- Remote CI execution is intentionally unverified until the branch is pushed. +- Hosted CI status is reported on [draft PR #136](https://github.com/InsanusMokrassar/KSLog/pull/136); the local evidence above does not imply a hosted pass. SDK setup explicitly requests `platforms;android-37.0` (API 37) and excludes the removed legacy `tools` package. ## Remote-only checks not performed -- GitHub Actions on an actual hosted runner. - Inmo Nexus upload. - Maven Central bundle upload/validation/release. - GitHub release creation. diff --git a/plugins/dokka/src/RunDokka.kt b/plugins/dokka/src/RunDokka.kt index b7955ec..9b7e8f9 100644 --- a/plugins/dokka/src/RunDokka.kt +++ b/plugins/dokka/src/RunDokka.kt @@ -114,8 +114,10 @@ private fun runDokka( addAll(analysisClasspaths.jvm) val sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT") if (sdkRoot != null) { - val androidJar = Path.of(sdkRoot).resolve("platforms/android-37/android.jar") - if (Files.isRegularFile(androidJar)) add(androidJar.pathString) + val androidJar = listOf("android-37.0", "android-37") + .map { Path.of(sdkRoot).resolve("platforms/$it/android.jar") } + .firstOrNull { Files.isRegularFile(it) } + if (androidJar != null) add(androidJar.pathString) } }