From 1b72472d37bfa818ad512956140af8ebf7c952be Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Tue, 27 Jan 2026 15:15:32 -0800 Subject: [PATCH 1/5] Upgrade AGP --- Yolo/android/build.gradle.kts | 4 ++-- dl3/android/DeepLabV3Demo/build.gradle.kts | 4 ++-- mv3/android/MV3Demo/build.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Yolo/android/build.gradle.kts b/Yolo/android/build.gradle.kts index 568efa281..a2f57ba62 100644 --- a/Yolo/android/build.gradle.kts +++ b/Yolo/android/build.gradle.kts @@ -8,6 +8,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.10" apply false + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "1.9.24" apply false } diff --git a/dl3/android/DeepLabV3Demo/build.gradle.kts b/dl3/android/DeepLabV3Demo/build.gradle.kts index 568efa281..a2f57ba62 100644 --- a/dl3/android/DeepLabV3Demo/build.gradle.kts +++ b/dl3/android/DeepLabV3Demo/build.gradle.kts @@ -8,6 +8,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.10" apply false + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "1.9.24" apply false } diff --git a/mv3/android/MV3Demo/build.gradle.kts b/mv3/android/MV3Demo/build.gradle.kts index 568efa281..a2f57ba62 100644 --- a/mv3/android/MV3Demo/build.gradle.kts +++ b/mv3/android/MV3Demo/build.gradle.kts @@ -8,6 +8,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.10" apply false + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "1.9.24" apply false } From a79205a4b674b483c1511be82d5b357c2e6dc0e2 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Tue, 27 Jan 2026 16:11:24 -0800 Subject: [PATCH 2/5] Update Compose Compiler version to 1.5.14 Upgrade kotlinCompilerExtensionVersion from 1.4.3 to 1.5.14 in MV3Demo, DeepLabV3Demo, and Yolo to match Kotlin 1.9.24 compatibility requirements. --- Yolo/android/app/build.gradle.kts | 2 +- dl3/android/DeepLabV3Demo/app/build.gradle.kts | 2 +- mv3/android/MV3Demo/app/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Yolo/android/app/build.gradle.kts b/Yolo/android/app/build.gradle.kts index d57a66083..f9dc9b567 100644 --- a/Yolo/android/app/build.gradle.kts +++ b/Yolo/android/app/build.gradle.kts @@ -42,7 +42,7 @@ android { } kotlinOptions { jvmTarget = "1.8" } buildFeatures { compose = true } - composeOptions { kotlinCompilerExtensionVersion = "1.4.3" } + composeOptions { kotlinCompilerExtensionVersion = "1.5.14" } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } } diff --git a/dl3/android/DeepLabV3Demo/app/build.gradle.kts b/dl3/android/DeepLabV3Demo/app/build.gradle.kts index 857150e51..70f5682bf 100644 --- a/dl3/android/DeepLabV3Demo/app/build.gradle.kts +++ b/dl3/android/DeepLabV3Demo/app/build.gradle.kts @@ -38,7 +38,7 @@ android { } kotlinOptions { jvmTarget = "1.8" } buildFeatures { compose = true } - composeOptions { kotlinCompilerExtensionVersion = "1.4.3" } + composeOptions { kotlinCompilerExtensionVersion = "1.5.14" } } dependencies { diff --git a/mv3/android/MV3Demo/app/build.gradle.kts b/mv3/android/MV3Demo/app/build.gradle.kts index 246ffe6e0..d1ceb30f1 100644 --- a/mv3/android/MV3Demo/app/build.gradle.kts +++ b/mv3/android/MV3Demo/app/build.gradle.kts @@ -38,7 +38,7 @@ android { } kotlinOptions { jvmTarget = "1.8" } buildFeatures { compose = true } - composeOptions { kotlinCompilerExtensionVersion = "1.4.3" } + composeOptions { kotlinCompilerExtensionVersion = "1.5.14" } } dependencies { From caa994424aa2b8984f7a5c66533cebe5a7b4fd31 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Tue, 27 Jan 2026 16:23:44 -0800 Subject: [PATCH 3/5] yolo build --- .github/workflows/android-build.yml | 7 +++++-- Yolo/android/app/build.gradle.kts | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index c49505d17..eabb370d3 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -33,6 +33,8 @@ jobs: path: dl3/android/DeepLabV3Demo - name: MV3Demo path: mv3/android/MV3Demo + - name: YoloDemo + path: Yolo/android name: Build ${{ matrix.name }} @@ -50,7 +52,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Download local AAR - if: ${{ inputs.local_aar && matrix.name == 'LlamaDemo' }} + if: ${{ inputs.local_aar && (matrix.name == 'LlamaDemo' || matrix.name == 'YoloDemo') }} run: | mkdir -p ${{ matrix.path }}/app/libs curl -fL -o ${{ matrix.path }}/app/libs/executorch.aar "${{ inputs.local_aar }}" @@ -58,7 +60,7 @@ jobs: - name: Build with Gradle working-directory: ${{ matrix.path }} run: | - if [ -n "${{ inputs.local_aar }}" ] && [ "${{ matrix.name }}" == "LlamaDemo" ]; then + if [ -n "${{ inputs.local_aar }}" ] && ([ "${{ matrix.name }}" == "LlamaDemo" ] || [ "${{ matrix.name }}" == "YoloDemo" ]); then ./gradlew build --no-daemon -PuseLocalAar=true else ./gradlew build --no-daemon @@ -112,6 +114,7 @@ jobs: - LlamaDemo APKs (`app-debug-LlamaDemo.apk`, `app-release-unsigned-LlamaDemo.apk`) - DeepLabV3Demo APKs (`app-debug-DeepLabV3Demo.apk`, `app-release-unsigned-DeepLabV3Demo.apk`) - MV3Demo APKs (`app-debug-MV3Demo.apk`, `app-release-unsigned-MV3Demo.apk`) + - YoloDemo APKs (`app-debug-YoloDemo.apk`, `app-release-unsigned-YoloDemo.apk`) **Build Date:** ${{ steps.tag.outputs.build_date }} **Commit:** ${{ github.sha }} diff --git a/Yolo/android/app/build.gradle.kts b/Yolo/android/app/build.gradle.kts index f9dc9b567..9c0df6515 100644 --- a/Yolo/android/app/build.gradle.kts +++ b/Yolo/android/app/build.gradle.kts @@ -60,7 +60,11 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha12") implementation("com.facebook.fbjni:fbjni:0.5.1") implementation("com.google.code.gson:gson:2.8.6") - implementation(files("libs/executorch.aar")) + if (useLocalAar == true) { + implementation(files("libs/executorch.aar")) + } else { + implementation("org.pytorch:executorch-android:1.0.1") + } implementation("com.google.android.material:material:1.12.0") implementation("androidx.activity:activity:1.9.0") From dcdd6c8a49e38abcab74bb02414be9bdbb831379 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 4 Feb 2026 16:43:56 -0800 Subject: [PATCH 4/5] 1.1.0 --- Yolo/android/app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yolo/android/app/build.gradle.kts b/Yolo/android/app/build.gradle.kts index 9c0df6515..99614ac8a 100644 --- a/Yolo/android/app/build.gradle.kts +++ b/Yolo/android/app/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { if (useLocalAar == true) { implementation(files("libs/executorch.aar")) } else { - implementation("org.pytorch:executorch-android:1.0.1") + implementation("org.pytorch:executorch-android:1.1.0") } implementation("com.google.android.material:material:1.12.0") From 90fd612223b467b62b560bd2d95f51db05d4d0df Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 4 Feb 2026 16:51:08 -0800 Subject: [PATCH 5/5] Fix --- Yolo/android/app/src/main/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Yolo/android/app/src/main/AndroidManifest.xml b/Yolo/android/app/src/main/AndroidManifest.xml index 0569bcb81..e05f5de4a 100644 --- a/Yolo/android/app/src/main/AndroidManifest.xml +++ b/Yolo/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ + +