Skip to content

Commit 9b7a749

Browse files
committed
Updates all the things
For each example, this: - Updates to using Android Gradle Plugin 8.0 - Adds ndkVersion to build.gradle - Updates all cargo deps and fixes / updates examples as needed - Avoids depending on any git branches for winit/egui now that the required Android support is upstream. - Removes all .idea files and adds .idea to .gitignore Adds a na-egui example that tests NativeActivity + Egui (same code as agdk-egui, but built against NativeActivity instead of GameActivity) This updates .github/workflows/ci.yml so all examples are built and `./gradlew build` is run - not just `cargo ndk build`
1 parent 872e722 commit 9b7a749

File tree

200 files changed

+8153
-4128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+8153
-4128
lines changed

.github/workflows/ci.yml

Lines changed: 68 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ env:
99
CARGO_INCREMENTAL: 0
1010
RUSTFLAGS: "-C debuginfo=0 --deny warnings"
1111
RUSTDOCFLAGS: -Dwarnings
12-
12+
CARGO_TARGET_DIR: ${{ env.GITHUB_WORKSPACE }}/shared-target
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
fail-fast: false
1818
matrix:
1919
rust_version: [stable]
20+
cargo_ndk_args: [-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/]
2021
steps:
2122
- uses: actions/checkout@v2
2223

@@ -49,45 +50,85 @@ jobs:
4950
# a shared target to speed up builds of all examples
5051
run: mkdir shared-target
5152

53+
- name: Build na-mainloop example
54+
working-directory: na-mainloop
55+
run: >
56+
echo "TARGET_DIR=$CARGO_TARGET_DIR"
57+
cargo ndk ${{ matrix.cargo_ndk_args }} build
58+
./gradlew build
59+
5260
- name: Build agdk-mainloop example
5361
working-directory: agdk-mainloop
5462
run: >
55-
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
56-
-t arm64-v8a
57-
-t armeabi-v7a
58-
-t x86_64
59-
-t x86
60-
-o app/src/main/jniLibs/ -- build
63+
cargo ndk ${{ matrix.cargo_ndk_args }} build
64+
./gradlew build
6165
62-
- name: Build na-mainloop example
63-
working-directory: na-mainloop
66+
- name: Build na-subclass-jni
67+
working-directory: na-subclass-jni
68+
run: >
69+
cargo ndk ${{ matrix.cargo_ndk_args }} build
70+
./gradlew build
71+
72+
- name: Build na-winit-wgpu
73+
working-directory: na-winit-wgpu
74+
run: >
75+
cargo ndk ${{ matrix.cargo_ndk_args }} build
76+
./gradlew build
77+
78+
- name: Build na-winit-glutin
79+
working-directory: na-winit-glutin
80+
run: >
81+
cargo ndk ${{ matrix.cargo_ndk_args }} build
82+
./gradlew build
83+
84+
- name: Build agdk-winit-glutin
85+
working-directory: na-winit-glutin
86+
run: >
87+
cargo ndk ${{ matrix.cargo_ndk_args }} build
88+
./gradlew build
89+
90+
- name: Build agdk-cpal
91+
working-directory: agdk-cpal
92+
run: >
93+
cargo ndk ${{ matrix.cargo_ndk_args }} build
94+
./gradlew build
95+
96+
- name: Build agdk-oboe
97+
working-directory: agdk-oboe
98+
run: >
99+
cargo ndk ${{ matrix.cargo_ndk_args }} build
100+
./gradlew build
101+
102+
- name: Build na-egui example
103+
working-directory: na-egui
64104
run: >
65-
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
66-
-t arm64-v8a
67-
-t armeabi-v7a
68-
-t x86_64
69-
-t x86
70-
-o app/src/main/jniLibs/ -- build
105+
cargo ndk ${{ matrix.cargo_ndk_args }} build
106+
./gradlew build
71107
72108
- name: Build agdk-egui example
73109
working-directory: agdk-egui
74110
run: >
75-
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
76-
-t arm64-v8a
77-
-t armeabi-v7a
78-
-t x86_64
79-
-t x86
80-
-o app/src/main/jniLibs/ -- build
111+
cargo ndk ${{ matrix.cargo_ndk_args }} build
112+
./gradlew build
81113
82114
- name: Build agdk-eframe example
83115
working-directory: agdk-eframe
84116
run: >
85-
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
86-
-t arm64-v8a
87-
-t armeabi-v7a
88-
-t x86_64
89-
-t x86
90-
-o app/src/main/jniLibs/ -- build
117+
cargo ndk ${{ matrix.cargo_ndk_args }} build
118+
./gradlew build
119+
120+
- name: Build na-openxr-info example
121+
working-directory: na-openxr-info
122+
run: >
123+
cargo ndk ${{ matrix.cargo_ndk_args }} build
124+
./gradlew build
125+
126+
- name: Build na-openxr-wgpu
127+
working-directory: na-openxr-wgpu
128+
run: >
129+
cargo ndk ${{ matrix.cargo_ndk_args }} build
130+
./gradlew build
131+
91132
92133
format:
93134
runs-on: ubuntu-latest

agdk-cpal/.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
4+
/.idea
105
.DS_Store
116
/build
127
/captures

agdk-cpal/.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

agdk-cpal/.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

agdk-cpal/.idea/gradle.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

agdk-cpal/.idea/misc.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

agdk-cpal/.idea/vcs.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)