Skip to content

Commit 95c47f2

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 95c47f2

File tree

212 files changed

+8143
-4127
lines changed

Some content is hidden

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

212 files changed

+8143
-4127
lines changed

.github/workflows/ci.yml

Lines changed: 81 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@ name: ci
22

33
on:
44
push:
5-
branches: [main]
65
pull_request:
76

87
env:
98
CARGO_INCREMENTAL: 0
109
RUSTFLAGS: "-C debuginfo=0 --deny warnings"
1110
RUSTDOCFLAGS: -Dwarnings
12-
1311
jobs:
1412
build:
1513
runs-on: ubuntu-latest
1614
strategy:
1715
fail-fast: false
1816
matrix:
1917
rust_version: [stable]
18+
cargo_ndk_args: [-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/]
2019
steps:
21-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2221

2322
- uses: hecrj/setup-rust-action@v1
2423
with:
@@ -49,50 +48,102 @@ jobs:
4948
# a shared target to speed up builds of all examples
5049
run: mkdir shared-target
5150

51+
- name: Build na-mainloop example
52+
working-directory: na-mainloop
53+
run: >
54+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
55+
./gradlew build &&
56+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
57+
5258
- name: Build agdk-mainloop example
5359
working-directory: agdk-mainloop
5460
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
61+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
62+
./gradlew build &&
63+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
6164
62-
- name: Build na-mainloop example
63-
working-directory: na-mainloop
65+
- name: Build na-subclass-jni
66+
working-directory: na-subclass-jni
67+
run: >
68+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
69+
./gradlew build &&
70+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
71+
72+
- name: Build na-winit-wgpu
73+
working-directory: na-winit-wgpu
74+
run: >
75+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
76+
./gradlew build &&
77+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
78+
79+
- name: Build na-winit-glutin
80+
working-directory: na-winit-glutin
81+
run: >
82+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
83+
./gradlew build &&
84+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
85+
86+
- name: Build agdk-winit-glutin
87+
working-directory: na-winit-glutin
88+
run: >
89+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
90+
./gradlew build &&
91+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
92+
93+
- name: Build agdk-cpal
94+
working-directory: agdk-cpal
95+
run: >
96+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
97+
./gradlew build &&
98+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
99+
100+
- name: Build agdk-oboe
101+
working-directory: agdk-oboe
102+
run: >
103+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
104+
./gradlew build &&
105+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
106+
107+
- name: Build na-egui example
108+
working-directory: na-egui
64109
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
110+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
111+
./gradlew build &&
112+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
71113
72114
- name: Build agdk-egui example
73115
working-directory: agdk-egui
74116
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
117+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
118+
./gradlew build &&
119+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
81120
82121
- name: Build agdk-eframe example
83122
working-directory: agdk-eframe
84123
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
124+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
125+
./gradlew build &&
126+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
127+
128+
- name: Build na-openxr-info example
129+
working-directory: na-openxr-info
130+
run: >
131+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build --features=android &&
132+
./gradlew build &&
133+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
134+
135+
- name: Build na-openxr-wgpu
136+
working-directory: na-openxr-wgpu
137+
run: >
138+
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
139+
./gradlew build &&
140+
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
141+
91142
92143
format:
93144
runs-on: ubuntu-latest
94145
steps:
95-
- uses: actions/checkout@v2
146+
- uses: actions/checkout@v3
96147

97148
- uses: actions-rs/toolchain@v1
98149
with:

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)