Skip to content

Commit

Permalink
Rename examples to ndk-examples
Browse files Browse the repository at this point in the history
[Dependabot complains] that:

    the binary target name `examples` is forbidden, it conflicts with cargo's build directory names

And fails to provide dependency upgrades for Rust code.  Fix that by
renaming the folder and crate to `ndk-examples`.

[Dependabot complains]: https://github.com/rust-mobile/cargo-apk/network/updates/774333460
  • Loading branch information
MarijnS95 committed Jan 19, 2024
1 parent b6555b0 commit caa8062
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ adb uninstall rust.example.hello_world || true

if [ -z "$1" ];
then
cargo apk run -p examples --target x86_64-linux-android --example hello_world --no-logcat
cargo apk 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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
run: cargo install --path cargo-apk

- name: Cargo apk build for target ${{ matrix.rust-target }}
run: cargo apk build -p examples --target ${{ matrix.rust-target }} --examples
run: cargo apk 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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = [
"ndk-build",
"examples",
"ndk-examples",
"cargo-apk",
]
2 changes: 1 addition & 1 deletion examples/Cargo.toml → ndk-examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "examples"
name = "ndk-examples"
version = "0.1.0"
authors = ["David Craven <[email protected]>"]
edition = "2018"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit caa8062

Please sign in to comment.