update

nihui · Apr 11, 2024 · 7ca4706 · 7ca4706
1 parent 2e9a455
commit 7ca4706
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml
@@ -6,9 +6,10 @@ on: [push]
       # - '*'
 
 env:
-  NCNN_VERSION: 20231027
-  OPENCV_VERSION: 4.8.1
-  OPENCV_MOBILE_TAG: v22
+  NCNN_VERSION: 20240410
+  OPENCV_VERSION: 4.9.0
+  OPENCV_MOBILE_TAG: v26
+  BUILD_TOOLS_VERSION: 32.0.0
 
 jobs:
   release-apk:
@@ -47,10 +48,10 @@ jobs:
             -dname "CN=mqttserver.ibm.com, OU=ID, O=IBM, L=Hursley, S=Hants, C=GB"\
             -keystore ncnn.keystore -storepass 7767517 -keypass 7767517 \
             -keyalg RSA -keysize 2048 -validity 10000
-        ${ANDROID_HOME}/build-tools/29.0.2/zipalign -f -v 4 ${UNSIGNED_APK} ${SIGNED_APK}
-        ${ANDROID_HOME}/build-tools/29.0.2/apksigner sign --ks ncnn.keystore --ks-key-alias ncnn \
+        ${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/zipalign -f -v 4 ${UNSIGNED_APK} ${SIGNED_APK}
+        ${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/apksigner sign --ks ncnn.keystore --ks-key-alias ncnn \
             --ks-pass pass:7767517 --key-pass pass:7767517 --out ${SIGNED_APK} ${SIGNED_APK}
-        ${ANDROID_HOME}/build-tools/29.0.2/apksigner verify ${SIGNED_APK}
+        ${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/apksigner verify ${SIGNED_APK}
         echo "SIGNED_APK=${SIGNED_APK}" >> $GITHUB_OUTPUT
         echo "APK_VERSION=${DATE}.${SHA_SHORT}" >> $GITHUB_OUTPUT
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 21
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "com.tencent.nanodetncnn"
         archivesBaseName = "$applicationId"
 
-        minSdkVersion 24
+        minSdkVersion 21
     }
 
     externalNativeBuild {