From 646bc0d274fce752ee3464efe54ae369471fff8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 15:34:28 -0700 Subject: [PATCH] build(deps): bump the android-deps group in /apps/android with 3 updates (#91365) * build(deps): bump the android-deps group in /apps/android with 3 updates Bumps the android-deps group in /apps/android with 3 updates: androidx.core:core-ktx, [org.jetbrains.kotlin.plugin.compose](https://github.com/JetBrains/kotlin) and [org.jetbrains.kotlin.plugin.serialization](https://github.com/JetBrains/kotlin). Updates `androidx.core:core-ktx` from 1.18.0 to 1.19.0 Updates `org.jetbrains.kotlin.plugin.compose` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) --- updated-dependencies: - dependency-name: androidx.core:core-ktx dependency-version: 1.19.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: android-deps - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: android-deps - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: android-deps - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: android-deps ... Signed-off-by: dependabot[bot] * fix(android): support compile SDK 37 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Steinberger --- .github/workflows/ci.yml | 6 +++--- apps/android/app/build.gradle.kts | 2 +- .../ai/openclaw/app/gateway/GatewayDiscovery.kt | 15 ++++++++++++++- apps/android/benchmark/build.gradle.kts | 2 +- apps/android/gradle/libs.versions.toml | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d64ddf678f87..6e59702c47d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2093,7 +2093,7 @@ jobs: uses: actions/cache@v5 with: path: ~/.android-sdk - key: ${{ runner.os }}-android-sdk-v1-cmdline-12266719-platform-36-build-tools-36.0.0 + key: ${{ runner.os }}-android-sdk-v1-cmdline-14742923-platform-37.0-build-tools-36.0.0 restore-keys: | ${{ runner.os }}-android-sdk-v1- @@ -2101,7 +2101,7 @@ jobs: run: | set -euo pipefail ANDROID_SDK_ROOT="$HOME/.android-sdk" - CMDLINE_TOOLS_VERSION="12266719" + CMDLINE_TOOLS_VERSION="14742923" ARCHIVE="commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip" URL="https://dl.google.com/android/repository/${ARCHIVE}" @@ -2123,7 +2123,7 @@ jobs: yes | sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses >/dev/null sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install \ "platform-tools" \ - "platforms;android-36" \ + "platforms;android-37.0" \ "build-tools;36.0.0" - name: Run Android ${{ matrix.task }} diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts index 5b916458b776..62d01d91b3f9 100644 --- a/apps/android/app/build.gradle.kts +++ b/apps/android/app/build.gradle.kts @@ -41,7 +41,7 @@ plugins { android { namespace = "ai.openclaw.app" - compileSdk = 36 + compileSdk = 37 // Release signing is local-only; keep the keystore path and passwords out of the repo. signingConfigs { diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt index 4aa5b4ca8a54..c3e8108476d4 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt @@ -49,6 +49,19 @@ import java.util.concurrent.Executors import kotlin.coroutines.resume import kotlin.coroutines.resumeWithException +private fun createDnsResolver(context: Context): DnsResolver = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN) { + createContextDnsResolver(context) + } else { + createLegacyDnsResolver() + } + +@TargetApi(Build.VERSION_CODES.CINNAMON_BUN) +private fun createContextDnsResolver(context: Context): DnsResolver = DnsResolver(context, null) + +@Suppress("DEPRECATION") +private fun createLegacyDnsResolver(): DnsResolver = DnsResolver.getInstance() + /** * Watches local DNS-SD and optional wide-area DNS-SD for reachable OpenClaw gateways. */ @@ -58,7 +71,7 @@ class GatewayDiscovery( ) { private val nsd = context.getSystemService(NsdManager::class.java) private val connectivity = context.getSystemService(ConnectivityManager::class.java) - private val dns = DnsResolver.getInstance() + private val dns = createDnsResolver(context) private val serviceType = "_openclaw-gw._tcp." private val wideAreaDomain = System.getenv("OPENCLAW_WIDE_AREA_DOMAIN") private val logTag = "OpenClaw/GatewayDiscovery" diff --git a/apps/android/benchmark/build.gradle.kts b/apps/android/benchmark/build.gradle.kts index e3e2a6641bdc..3bf47d195861 100644 --- a/apps/android/benchmark/build.gradle.kts +++ b/apps/android/benchmark/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "ai.openclaw.app.benchmark" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 31 diff --git a/apps/android/gradle/libs.versions.toml b/apps/android/gradle/libs.versions.toml index accf8725f803..6700d68055d5 100644 --- a/apps/android/gradle/libs.versions.toml +++ b/apps/android/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidx-activity = "1.13.0" androidx-benchmark = "1.4.1" androidx-camera = "1.6.0" androidx-compose-bom = "2026.05.01" -androidx-core = "1.18.0" +androidx-core = "1.19.0" androidx-exifinterface = "1.4.2" androidx-lifecycle = "2.10.0" androidx-security = "1.1.0" @@ -19,7 +19,7 @@ junit = "4.13.2" junit-vintage = "6.1.0" kotest = "6.1.11" ktlint-gradle = "14.2.0" -kotlin = "2.3.21" +kotlin = "2.4.0" material = "1.14.0" okhttp = "5.3.2" play-services-code-scanner = "16.1.0"