将版本升级至 1.0.1，更新 CI 配置。

.github/workflows/android_test.sh

@@ -10,7 +10,7 @@ adb uninstall rust.example.hello_world || true
 
 if [ -z "$1" ];
 then
-    cargo apk run -p ndk-examples --target x86_64-linux-android --example hello_world --no-logcat
+    cargo apk2 run -p ndk-examples --target x86_64-linux-android --example hello_world --no-logcat
 else
     adb install -r "$1/hello_world.apk"
     adb shell am start -a android.intent.action.MAIN -n "rust.example.hello_world/android.app.NativeActivity"

.github/workflows/publish.yml

@@ -3,19 +3,19 @@ name: Publish
 on:
   push:
     branches: [main]
-    paths: "**/Cargo.toml"
+    paths: ["**/Cargo.toml"]
 
 jobs:
   Publish:
-    if: github.repository_owner == 'rust-mobile'
+    if: github.repository_owner == 'mzdk100'
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 1 # ensure crate order
       fail-fast: false
       matrix:
         crate:
-          - { name: "ndk-build", target: "x86_64-unknown-linux-gnu" }
-          - { name: "cargo-apk", target: "x86_64-unknown-linux-gnu" }
+          - { name: "ndk-build2", target: "x86_64-unknown-linux-gnu" }
+          - { name: "cargo-apk2", target: "x86_64-unknown-linux-gnu" }
     steps:
       - uses: actions/checkout@v4
       - name: Publish ${{ matrix.crate.name }}

.github/workflows/rust.yml

@@ -24,11 +24,11 @@ jobs:
         run: cargo clippy --all --all-targets --all-features --target aarch64-linux-android -- -Dwarnings
 
   check_msrv:
-    name: Check MSRV (1.70.0)
+    name: Check MSRV (1.82.0)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.70.0
+      - uses: dtolnay/rust-toolchain@1.82.0
         with:
           target: aarch64-linux-android
       - name: Check
@@ -66,11 +66,11 @@ jobs:
           rustup default ${{ matrix.rust-channel }}
           rustup target add ${{ matrix.rust-target }}
 
-      - name: Install cargo-apk
-        run: cargo install --path cargo-apk
+      - name: Install cargo-apk2
+        run: cargo install --path cargo-apk2
 
       - name: Cargo apk build for target ${{ matrix.rust-target }}
-        run: cargo apk build -p ndk-examples --target ${{ matrix.rust-target }} --examples
+        run: cargo apk2 build -p ndk-examples --target ${{ matrix.rust-target }} --examples
 
       - uses: actions/upload-artifact@v3
         # Only need this for CI, unless users are interested in downloading
@@ -89,7 +89,7 @@ jobs:
       matrix:
         source_os: [ubuntu-latest, windows-latest, local]
     env:
-      api-level: 29
+      api-level: 35
       emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
       arch: x86_64
       # the `googleapis` emulator target is considerably slower on CI.
@@ -107,10 +107,10 @@ jobs:
         with:
           name: hello_world_${{ matrix.source_os }}_x86_64-linux-android
 
-      - name: Install `cargo-apk` and add `x86_64-linux-android` target
+      - name: Install `cargo-apk2` and add `x86_64-linux-android` target
         if: ${{ matrix.source_os == 'local' }}
         run: |
-          cargo install --path cargo-apk
+          cargo install --path cargo-apk2
           rustup target add x86_64-linux-android
 
       - name: AVD cache
@@ -173,11 +173,11 @@ jobs:
           rustup toolchain install ${{ matrix.rust-channel }}
           rustup default ${{ matrix.rust-channel }}
 
-      - name: Test ndk-build
-        run: cargo test -p ndk-build --all-features
+      - name: Test ndk-build2
+        run: cargo test -p ndk-build2 --all-features
 
-      - name: Test cargo-apk
-        run: cargo test -p cargo-apk --all-features
+      - name: Test cargo-apk2
+        run: cargo test -p cargo-apk2 --all-features
 
   docs:
     strategy:

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.0.0"
+version = "1.0.1"
 authors = [
     "SmileSky <[email protected]>",
     "The Rust Windowing contributors",

cargo-apk2/README.md

@@ -36,6 +36,9 @@
 
 ```toml
 [package.metadata.android]
+# 使用aapt2构建工具来编译资源
+use_aapt2 = true
+
 # 指定清单的包属性。
 package = "com.foo.bar"