Skip to content

Commit ab4f2ae

Browse files
committed
Update NDK, SDK, and tooling versions; rename compiler to wrapper.
Upgraded NDK to r28c, SDK to 13114758_latest, and updated API levels and BuildTool version to 35 across documentation, Dockerfile, and workflows. Refactored workflow and related scripts to replace "Radiant-Compiler" with "Radiant-Wrapper" for package installation and usage. These changes ensure compatibility with newer Android tooling and improve consistency in naming.
1 parent 57b9cc4 commit ab4f2ae

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ To use this workflow, copy the `radiant_wrapper.yml` file to your repository's `
5555
## Software Versions Included in the Image
5656

5757
```
58-
NDK_VERSION=r25b
59-
SDK_VERSION=10406996_latest
58+
NDK_VERSION=r28c
59+
SDK_VERSION=13114758_latest
6060
JAVA_VERSION=jdk17-openjdk
61-
NDKAPI=30
62-
ANDROIDAPI=30
63-
BUILDTOOL=34.0.0
61+
NDKAPI=35
62+
ANDROIDAPI=35
63+
BUILDTOOL=35.0.0
6464
P4A_VERSION=2024.1.21
6565
CYTHON_VERSION=3.0.4
6666
```

docker/radiant_p4a.dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ LABEL image="dunderlab/radiant_p4a" \
88
documentation="" \
99
license="BSD 2-Clause"
1010

11-
ARG NDK_VERSION=r25b \
12-
SDK_VERSION=10406996_latest \
11+
ARG NDK_VERSION=r28c \
12+
SDK_VERSION=13114758_latest \
1313
JAVA_VERSION=jdk17-openjdk \
14-
NDKAPI=30 \
15-
ANDROIDAPI=30 \
16-
BUILDTOOL=34.0.0 \
14+
NDKAPI=35 \
15+
ANDROIDAPI=35 \
16+
BUILDTOOL=35.0.0 \
1717
P4A_VERSION=2024.1.21 \
1818
CYTHON_VERSION=3.0.4
1919

workflows/radiant_wrapper.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
uses: actions/checkout@v4
1414
# Clones the repository code into the workflow environment
1515

16-
- name: Install Radiant-Compiler
16+
- name: Install Radiant-Wrapper
1717
run: |
18-
# Installs the Radiant-Compiler package for building Android apps
19-
pip install radiant-compiler
18+
# Installs the Radiant-Wrapper package for building Android apps
19+
pip install radiant-wrapper
2020
2121
- name: Execute Command in Docker Container
2222
run: |
@@ -27,7 +27,7 @@ jobs:
2727
DIST_NAME=$(grep -E '^--dist_name ' .p4a | awk '{print $2}')
2828
2929
# Handle Radiant Framework
30-
if [ -f "main.py" ] && grep -q "radiant.compiler" main.py; then
30+
if [ -f "main.py" ] && grep -q "radiant.wrapper" main.py; then
3131
pip download --no-deps radiant-framework
3232
unzip radiant_framework*.whl "radiant/*" -d .
3333
fi
@@ -36,10 +36,10 @@ jobs:
3636
if [ -f "$DIST_NAME/manage.py" ]; then
3737
pip download --no-deps django
3838
unzip django*.whl "django/*" -d .
39-
pip download --no-deps radiant-compiler
40-
unzip radiant_compiler*.whl "radiant/*" -d .
39+
pip download --no-deps radiant-wrapper
40+
unzip radiant_wrapper*.whl "radiant/*" -d .
4141
echo '
42-
from radiant.compiler import server
42+
from radiant.wrapper import server
4343
with open(".p4a", "r", encoding="utf-8") as f:
4444
for line in f:
4545
if line.strip().startswith("--port"):

0 commit comments

Comments
 (0)