test

.github/workflows/build.yml

@@ -227,6 +227,11 @@ jobs:
       - run: ccache -s
       - run: ./get-android-sys.sh
       - run: ../tests/basic.sh out/Release/naive
+      - name: Gradle cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle
+          key: gradle-${{ hashFiles('**/*.gradle.kts') }}
       - name: Create APK
         working-directory: apk
         env:
@@ -412,108 +417,108 @@ jobs:
       matrix:
         include:
           - arch: x86_64
-            openwrt: 'target=x86 subtarget=64'
+            openwrt: "target=x86 subtarget=64"
             target_cpu: x64
           - arch: x86
-            openwrt: 'target=x86 subtarget=generic'
+            openwrt: "target=x86 subtarget=generic"
             target_cpu: x86
           - arch: aarch64_cortex-a53
-            openwrt: 'target=sunxi subtarget=cortexa53'
+            openwrt: "target=sunxi subtarget=cortexa53"
             target_cpu: arm64
             extra: 'arm_cpu="cortex-a53"'
           - arch: aarch64_cortex-a53-static
-            openwrt: 'target=sunxi subtarget=cortexa53'
+            openwrt: "target=sunxi subtarget=cortexa53"
             target_cpu: arm64
             extra: 'arm_cpu="cortex-a53" build_static=true no_madvise_syscall=true'
           - arch: aarch64_cortex-a72
-            openwrt: 'target=mvebu subtarget=cortexa72'
+            openwrt: "target=mvebu subtarget=cortexa72"
             target_cpu: arm64
             extra: 'arm_cpu="cortex-a72"'
           - arch: aarch64_cortex-a72-static
-            openwrt: 'target=mvebu subtarget=cortexa72'
+            openwrt: "target=mvebu subtarget=cortexa72"
             target_cpu: arm64
             extra: 'arm_cpu="cortex-a72" build_static=true no_madvise_syscall=true'
           - arch: aarch64_generic
-            openwrt: 'target=rockchip subtarget=armv8'
+            openwrt: "target=rockchip subtarget=armv8"
             target_cpu: arm64
           - arch: aarch64_generic-static
-            openwrt: 'target=rockchip subtarget=armv8'
+            openwrt: "target=rockchip subtarget=armv8"
             target_cpu: arm64
-            extra: 'build_static=true no_madvise_syscall=true'
+            extra: "build_static=true no_madvise_syscall=true"
           - arch: arm_arm1176jzf-s_vfp
-            openwrt: 'target=bcm27xx subtarget=bcm2708'
+            openwrt: "target=bcm27xx subtarget=bcm2708"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="arm1176jzf-s" arm_fpu="vfp" arm_float_abi="hard" arm_use_neon=false arm_use_thumb=false'
           - arch: arm_arm926ej-s
-            openwrt: 'target=mxs subtarget=generic'
+            openwrt: "target=mxs subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="arm926ej-s" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
           - arch: arm_cortex-a15_neon-vfpv4
-            openwrt: 'target=armsr subtarget=armv7'
+            openwrt: "target=armsr subtarget=armv7"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a15" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true'
           - arch: arm_cortex-a5_vfpv4
-            openwrt: 'target=at91 subtarget=sama5'
+            openwrt: "target=at91 subtarget=sama5"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a5" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false'
           - arch: arm_cortex-a7
-            openwrt: 'target=mediatek subtarget=mt7629'
+            openwrt: "target=mediatek subtarget=mt7629"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a7" arm_float_abi="soft" arm_use_neon=false'
           - arch: arm_cortex-a7_neon-vfpv4
-            openwrt: 'target=sunxi subtarget=cortexa7'
+            openwrt: "target=sunxi subtarget=cortexa7"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true'
           - arch: arm_cortex-a7_vfpv4
-            openwrt: 'target=at91 subtarget=sama7'
+            openwrt: "target=at91 subtarget=sama7"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false'
           - arch: arm_cortex-a7_neon-vfpv4-static
-            openwrt: 'target=sunxi subtarget=cortexa7'
+            openwrt: "target=sunxi subtarget=cortexa7"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true build_static=true no_madvise_syscall=true'
           - arch: arm_cortex-a8_vfpv3
-            openwrt: 'target=sunxi subtarget=cortexa8'
+            openwrt: "target=sunxi subtarget=cortexa8"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a8" arm_fpu="vfpv3" arm_float_abi="hard" arm_use_neon=false'
           - arch: arm_cortex-a9
-            openwrt: 'target=bcm53xx subtarget=generic'
+            openwrt: "target=bcm53xx subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false'
           - arch: arm_cortex-a9-static
-            openwrt: 'target=bcm53xx subtarget=generic'
+            openwrt: "target=bcm53xx subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false build_static=true no_madvise_syscall=true'
           - arch: arm_cortex-a9_neon
-            openwrt: 'target=zynq subtarget=generic'
+            openwrt: "target=zynq subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="neon" arm_float_abi="hard" arm_use_neon=true'
           - arch: arm_cortex-a9_vfpv3-d16
-            openwrt: 'target=tegra subtarget=generic'
+            openwrt: "target=tegra subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="vfpv3-d16" arm_float_abi="hard" arm_use_neon=false'
           - arch: arm_mpcore
-            openwrt: 'target=oxnas subtarget=ox820'
+            openwrt: "target=oxnas subtarget=ox820"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="mpcore" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
           - arch: arm_xscale
-            openwrt: 'target=kirkwood subtarget=generic'
+            openwrt: "target=kirkwood subtarget=generic"
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="xscale" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
           - arch: mipsel_24kc
-            openwrt: 'target=ramips subtarget=rt305x'
+            openwrt: "target=ramips subtarget=rt305x"
             target_cpu: mipsel
             extra: 'mips_arch_variant="r2" mips_float_abi="soft"'
           - arch: mipsel_24kc-static
-            openwrt: 'target=ramips subtarget=rt305x'
+            openwrt: "target=ramips subtarget=rt305x"
             target_cpu: mipsel
             extra: 'mips_arch_variant="r2" mips_float_abi="soft" build_static=true no_madvise_syscall=true'
           - arch: mipsel_mips32
-            openwrt: 'target=bcm47xx subtarget=generic'
+            openwrt: "target=bcm47xx subtarget=generic"
             target_cpu: mipsel
             extra: 'mips_arch_variant="r1" mips_float_abi="soft"'
           - arch: riscv64
-            openwrt: 'target=sifiveu subtarget=generic'
+            openwrt: "target=sifiveu subtarget=generic"
             target_cpu: riscv64
     env:
       EXTRA_FLAGS: target_cpu="${{ matrix.target_cpu }}" target_os="openwrt" ${{ matrix.extra }}

apk/app/build.gradle.kts

@@ -63,7 +63,7 @@ android {
         outputs.all {
             this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
             outputFileName =
-                outputFileName.replace(project.name, "naiveproxy-plugin-$versionName")
+                outputFileName.replace(project.name, "naiveproxy-plugin-v$versionName")
                     .replace("-release", "")
                     .replace("-oss", "")
         }