chore: local-build branch - simplified gradle for Android Studio

- Remove benchmark module
- Use AGP 8.7.3 + Kotlin 2.0.21 (stable)
- Remove ktlint plugin
- Simplify app/build.gradle.kts (remove flavor, sourceSet overrides)
- Update version catalog with compatible library versions

app/build.gradle.kts

@@ -1,115 +1,33 @@
-import com.android.build.api.variant.impl.VariantOutputImpl
-
-val dnsjavaInetAddressResolverService = "META-INF/services/java.net.spi.InetAddressResolverProvider"
-
-val androidStoreFile = providers.gradleProperty("OPENCLAW_ANDROID_STORE_FILE").orNull?.takeIf { it.isNotBlank() }
-val androidStorePassword = providers.gradleProperty("OPENCLAW_ANDROID_STORE_PASSWORD").orNull?.takeIf { it.isNotBlank() }
-val androidKeyAlias = providers.gradleProperty("OPENCLAW_ANDROID_KEY_ALIAS").orNull?.takeIf { it.isNotBlank() }
-val androidKeyPassword = providers.gradleProperty("OPENCLAW_ANDROID_KEY_PASSWORD").orNull?.takeIf { it.isNotBlank() }
-val resolvedAndroidStoreFile =
-  androidStoreFile?.let { storeFilePath ->
-    if (storeFilePath.startsWith("~/")) {
-      "${System.getProperty("user.home")}/${storeFilePath.removePrefix("~/")}"
-    } else {
-      storeFilePath
-    }
-  }
-
-val hasAndroidReleaseSigning =
-  listOf(resolvedAndroidStoreFile, androidStorePassword, androidKeyAlias, androidKeyPassword).all { it != null }
-
-val wantsAndroidReleaseBuild =
-  gradle.startParameter.taskNames.any { taskName ->
-    taskName.contains("Release", ignoreCase = true) ||
-      Regex("""(^|:)(bundle|assemble)$""").containsMatchIn(taskName)
-  }
-
-if (wantsAndroidReleaseBuild && !hasAndroidReleaseSigning) {
-  error(
-    "Missing Android release signing properties. Set OPENCLAW_ANDROID_STORE_FILE, " +
-      "OPENCLAW_ANDROID_STORE_PASSWORD, OPENCLAW_ANDROID_KEY_ALIAS, and " +
-      "OPENCLAW_ANDROID_KEY_PASSWORD in ~/.gradle/gradle.properties.",
-  )
-}
-
 plugins {
   alias(libs.plugins.android.application)
-  alias(libs.plugins.ktlint)
   alias(libs.plugins.kotlin.compose)
   alias(libs.plugins.kotlin.serialization)
 }
 
 android {
   namespace = "ai.openclaw.app"
-  compileSdk = 36
-
-  // Release signing is local-only; keep the keystore path and passwords out of the repo.
-  signingConfigs {
-    if (hasAndroidReleaseSigning) {
-      create("release") {
-        storeFile = project.file(checkNotNull(resolvedAndroidStoreFile))
-        storePassword = checkNotNull(androidStorePassword)
-        keyAlias = checkNotNull(androidKeyAlias)
-        keyPassword = checkNotNull(androidKeyPassword)
-      }
-    }
-  }
-
-  sourceSets {
-    getByName("main") {
-      assets.directories.add("../../shared/OpenClawKit/Sources/OpenClawKit/Resources")
-    }
-  }
+  compileSdk = 35
 
   defaultConfig {
     applicationId = "ai.openclaw.app"
     minSdk = 31
-    targetSdk = 36
+    targetSdk = 35
     versionCode = 2026052100
-    versionName = "2026.5.21"
+    versionName = "1.3.2"
+
     ndk {
-      // Support all major ABIs — native libs are tiny (~47 KB per ABI)
       abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
     }
   }
 
-  flavorDimensions += "store"
-
-  productFlavors {
-    create("play") {
-      dimension = "store"
-    }
-    create("thirdParty") {
-      dimension = "store"
-    }
-  }
-
-  sourceSets {
-    getByName("play") {
-      java.srcDirs("src/thirdParty/java")
-    }
-  }
-
   buildTypes {
     release {
-      if (hasAndroidReleaseSigning) {
-        signingConfig = signingConfigs.getByName("release")
-      }
       isMinifyEnabled = true
-      isShrinkResources = true
-      ndk {
-        debugSymbolLevel = "SYMBOL_TABLE"
-      }
-      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+      proguardFiles(
+        getDefaultProguardFile("proguard-android-optimize.txt"),
+        "proguard-rules.pro"
+      )
     }
-    debug {
-      isMinifyEnabled = false
-    }
-  }
-
-  buildFeatures {
-    compose = true
-    buildConfig = true
   }
 
   compileOptions {
@@ -117,171 +35,28 @@ android {
     targetCompatibility = JavaVersion.VERSION_17
   }
 
-  packaging {
-    resources {
-      excludes +=
-        setOf(
-          "/META-INF/{AL2.0,LGPL2.1}",
-          "/META-INF/*.version",
-          "/META-INF/LICENSE*.txt",
-          "DebugProbesKt.bin",
-          "kotlin-tooling-metadata.json",
-          "org/bouncycastle/pqc/crypto/picnic/lowmcL1.bin.properties",
-          "org/bouncycastle/pqc/crypto/picnic/lowmcL3.bin.properties",
-          "org/bouncycastle/pqc/crypto/picnic/lowmcL5.bin.properties",
-          "org/bouncycastle/x509/CertPathReviewerMessages*.properties",
-        )
-    }
+  kotlin {
+    jvmToolchain(17)
   }
 
-  lint {
-    lintConfig = file("lint.xml")
-    warningsAsErrors = true
-  }
-
-  testOptions {
-    unitTests.isIncludeAndroidResources = true
-  }
-}
-
-androidComponents {
-  onVariants { variant ->
-    variant.outputs
-      .filterIsInstance<VariantOutputImpl>()
-      .forEach { output ->
-        val versionName = output.versionName.orNull ?: "0"
-        val buildType = variant.buildType
-        val flavorName = variant.flavorName?.takeIf { it.isNotBlank() }
-        val outputFileName =
-          if (flavorName == null) {
-            "openclaw-$versionName-$buildType.apk"
-          } else {
-            "openclaw-$versionName-$flavorName-$buildType.apk"
-          }
-        output.outputFileName = outputFileName
-      }
-  }
-}
-kotlin {
-  compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-    allWarningsAsErrors.set(true)
-  }
-}
-
-ktlint {
-  android.set(true)
-  ignoreFailures.set(false)
-  filter {
-    exclude("**/build/**")
+  buildFeatures {
+    compose = true
   }
 }
 
 dependencies {
-  val composeBom = platform(libs.androidx.compose.bom)
-  implementation(composeBom)
-  androidTestImplementation(composeBom)
-
-  implementation(libs.androidx.core.ktx)
-  implementation(libs.androidx.lifecycle.runtime.ktx)
-  implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.webkit)
-
+  implementation(platform(libs.androidx.compose.bom))
+  implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.ui)
   implementation(libs.androidx.compose.ui.tooling.preview)
-  implementation(libs.androidx.compose.material3)
-  // material-icons-extended pulled in full icon set (~20 MB DEX). Only ~18 icons used.
-  // R8 will tree-shake unused icons when minify is enabled on release builds.
-  implementation(libs.androidx.compose.material.icons.extended)
-
-  debugImplementation(libs.androidx.compose.ui.tooling)
-
-  // Material Components (XML theme + resources)
-  implementation(libs.material)
-
-  implementation(libs.kotlinx.coroutines.android)
-  implementation(libs.kotlinx.serialization.json)
-
-  implementation(libs.androidx.security.crypto)
-  implementation(libs.androidx.exifinterface)
-  implementation(libs.okhttp)
-  implementation(libs.bcprov)
-  implementation(libs.commonmark)
-  implementation(libs.commonmark.ext.autolink)
-  implementation(libs.commonmark.ext.gfm.strikethrough)
-  implementation(libs.commonmark.ext.gfm.tables)
-  implementation(libs.commonmark.ext.task.list.items)
-
-  // CameraX (for node.invoke camera.* parity)
-  implementation(libs.androidx.camera.core)
-  implementation(libs.androidx.camera.camera2)
-  implementation(libs.androidx.camera.lifecycle)
-  implementation(libs.androidx.camera.video)
-  implementation(libs.play.services.code.scanner)
-
-  // Unicast DNS-SD (Wide-Area Bonjour) for tailnet discovery domains.
-  implementation(libs.dnsjava)
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
+  implementation(libs.coroutines.core)
+  implementation(libs.coroutines.android)
+  implementation(libs.serialization.json)
   implementation(libs.jsch)
-
-  testImplementation(libs.junit)
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.kotest.runner.junit5)
-  testImplementation(libs.kotest.assertions.core)
-  testImplementation(libs.mockwebserver)
-  testImplementation(libs.robolectric)
-  testRuntimeOnly(libs.junit.vintage.engine)
-}
-
-tasks.withType<Test>().configureEach {
-  useJUnitPlatform()
-}
-
-androidComponents {
-  onVariants(selector().withBuildType("release")) { variant ->
-    val variantName = variant.name
-    val variantNameCapitalized = variantName.replaceFirstChar(Char::titlecase)
-    val stripTaskName = "strip${variantNameCapitalized}DnsjavaServiceDescriptor"
-    val mergeTaskName = "merge${variantNameCapitalized}JavaResource"
-    val minifyTaskName = "minify${variantNameCapitalized}WithR8"
-    val mergedJar =
-      layout.buildDirectory.file(
-        "intermediates/merged_java_res/$variantName/$mergeTaskName/base.jar",
-      )
-
-    val stripTask =
-      tasks.register(stripTaskName) {
-        inputs.file(mergedJar)
-        outputs.file(mergedJar)
-
-        doLast {
-          val jarFile = mergedJar.get().asFile
-          if (!jarFile.exists()) {
-            return@doLast
-          }
-
-          val unpackDir = temporaryDir.resolve("merged-java-res")
-          delete(unpackDir)
-          copy {
-            from(zipTree(jarFile))
-            into(unpackDir)
-            exclude(dnsjavaInetAddressResolverService)
-          }
-          delete(jarFile)
-          ant.invokeMethod(
-            "zip",
-            mapOf(
-              "destfile" to jarFile.absolutePath,
-              "basedir" to unpackDir.absolutePath,
-            ),
-          )
-        }
-      }
-
-    tasks.matching { it.name == mergeTaskName }.configureEach {
-      finalizedBy(stripTask)
-    }
-    tasks.matching { it.name == minifyTaskName }.configureEach {
-      dependsOn(stripTask)
-    }
-  }
+  implementation(libs.material)
+  debugImplementation(libs.androidx.compose.ui.tooling)
 }

benchmark/build.gradle.kts

@@ -1 +0,0 @@
-

build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+  alias(libs.plugins.android.application) apply false
+  alias(libs.plugins.kotlin.compose) apply false
+  alias(libs.plugins.kotlin.serialization) apply false
+}

gradle.properties

@@ -1,9 +1,4 @@
-org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8 --enable-native-access=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 org.gradle.warning.mode=all
 android.useAndroidX=true
 android.nonTransitiveRClass=true
-android.enableR8.fullMode=true
-android.uniquePackageNames=false
-android.dependency.useConstraints=false
-android.r8.strictFullModeForKeepRules=false
-android.newDsl=true

gradle/libs.versions.toml

@@ -1,76 +1,33 @@
 [versions]
-agp = "9.2.0"
-androidx-activity = "1.13.0"
-androidx-benchmark = "1.4.1"
-androidx-camera = "1.6.0"
-androidx-compose-bom = "2026.04.01"
-androidx-core = "1.18.0"
-androidx-exifinterface = "1.4.2"
-androidx-lifecycle = "2.10.0"
-androidx-security = "1.1.0"
-androidx-test-ext = "1.3.0"
-androidx-uiautomator = "2.4.0-beta02"
-androidx-webkit = "1.15.0"
-bcprov = "1.84"
-commonmark = "0.28.0"
-coroutines = "1.10.2"
-dnsjava = "3.6.4"
-junit = "4.13.2"
-junit-vintage = "6.0.3"
-kotest = "6.1.11"
-ktlint-gradle = "14.2.0"
-kotlin = "2.3.21"
-material = "1.13.0"
-okhttp = "5.3.2"
-play-services-code-scanner = "16.1.0"
-robolectric = "4.16.1"
-serialization-json = "1.11.0"
+agp = "8.7.3"
+kotlin = "2.0.21"
+compose-bom = "2024.12.01"
+core-ktx = "1.15.0"
+lifecycle = "2.8.7"
+activity-compose = "1.9.3"
+coroutines = "1.9.0"
+serialization-json = "1.7.3"
 jsch = "0.1.55"
+material = "1.12.0"
 
 [libraries]
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
-androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
-androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" }
-androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidx-camera" }
-androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
-androidx-camera-video = { module = "androidx.camera:camera-video", version.ref = "androidx-camera" }
-androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
-androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "androidx-exifinterface" }
-androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
-androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "androidx-security" }
-androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext" }
-androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx-uiautomator" }
-androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "androidx-webkit" }
-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bcprov" }
-commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
-commonmark-ext-autolink = { module = "org.commonmark:commonmark-ext-autolink", version.ref = "commonmark" }
-commonmark-ext-gfm-strikethrough = { module = "org.commonmark:commonmark-ext-gfm-strikethrough", version.ref = "commonmark" }
-commonmark-ext-gfm-tables = { module = "org.commonmark:commonmark-ext-gfm-tables", version.ref = "commonmark" }
-commonmark-ext-task-list-items = { module = "org.commonmark:commonmark-ext-task-list-items", version.ref = "commonmark" }
-dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" }
-junit = { module = "junit:junit", version.ref = "junit" }
-junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit-vintage" }
-kotest-assertions-core = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
-kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization-json" }
-material = { module = "com.google.android.material:material", version.ref = "material" }
-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-play-services-code-scanner = { module = "com.google.android.gms:play-services-code-scanner", version.ref = "play-services-code-scanner" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "1.79" }
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 jsch = { module = "com.jcraft:jsch", version.ref = "jsch" }
-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization-json" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-android-test = { id = "com.android.test", version.ref = "agp" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }

settings.gradle.kts

@@ -14,6 +14,5 @@ dependencyResolutionManagement {
   }
 }
 
-rootProject.name = "OpenClawNodeAndroid"
+rootProject.name = "Tergent"
 include(":app")
-include(":benchmark")