Skip to content

Commit 263511c

Browse files
authored
Merge branch 'master' into modify-docs
2 parents 34e9cdc + 223cf06 commit 263511c

File tree

9 files changed

+32
-28
lines changed

9 files changed

+32
-28
lines changed

.github/workflows/android.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- name: Setup python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.x'
2020
- name: Setup Java
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '17'
2424
distribution: 'temurin'
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: Setup environment
2727
run: |
2828
pip install .
@@ -38,7 +38,9 @@ jobs:
3838
if: matrix.os == 'ubuntu-latest'
3939
# Required by some p4a recipes, but not
4040
# installed by p4a on Linux.
41-
run: sudo apt -y install automake
41+
run: |
42+
sudo apt update
43+
sudo apt -y install automake libltdl-dev
4244
- name: Debug Build
4345
run: |
4446
touch main.py

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: read
1919
packages: write
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- uses: docker/setup-buildx-action@v3
2323

2424
# Login to DockerHub
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-24.04
6363
needs: build
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6666
- uses: peter-evans/dockerhub-description@v4
6767
if: ${{ env.SHOULD_PUBLISH == 'true' }}
6868
with:

.github/workflows/ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
runs-on: ${{ matrix.runs_on }}
77
strategy:
88
matrix:
9-
# macos-latest (ATM macos-14) runs on Apple Silicon,
9+
# macos-latest (ATM macos-15) runs on Apple Silicon,
1010
# macos-13 runs on Intel
1111
runs_on: [macos-latest, macos-13]
1212
steps:
1313
- name: Setup python
14-
uses: actions/setup-python@v5
14+
uses: actions/setup-python@v6
1515
with:
1616
python-version: '3.x'
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
- name: Setup environment
1919
run: |
2020
pip install .[ios]

.github/workflows/pypi-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
pypi_release:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v5
99
- name: Set up Python 3.x
10-
uses: actions/setup-python@v5
10+
uses: actions/setup-python@v6
1111
with:
1212
python-version: 3.x
1313
- name: Install build dependencies

.github/workflows/test_python.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,28 @@ jobs:
1010
- '3.9'
1111
- '3.10'
1212
- '3.11'
13+
- '3.12'
14+
- '3.13'
15+
- '3.14'
1316
os:
1417
- 'ubuntu-latest'
15-
- 'macOs-latest'
18+
- 'macos-latest'
1619
architecture:
1720
- 'x64'
1821

1922
runs-on: ${{ matrix.os }}
2023
steps:
21-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2225

2326
- name: Setup python
24-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2528
with:
2629
python-version: ${{ matrix.python }}
30+
allow-prereleases: true
2731

2832
- name: Requirements
2933
run: |
30-
pip install -U coveralls setuptools tox>=2.0
34+
pip install --upgrade coveralls setuptools tox>=2.0
3135
- name: Tox
3236
run: tox
3337
- name: Coveralls
@@ -53,7 +57,7 @@ jobs:
5357
Docker:
5458
runs-on: ubuntu-latest
5559
steps:
56-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
5761
- name: Docker build
5862
run: docker build --tag=kivy/buildozer .
5963
- name: Docker run
@@ -62,7 +66,7 @@ jobs:
6266
Documentation:
6367
runs-on: ubuntu-latest
6468
steps:
65-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
6670
- name: Requirements
6771
run: pip install -U sphinx sphinxawesome_theme
6872
- name: Check links

buildozer/default.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fullscreen = 0
109109
#android.features = android.hardware.usb.host
110110

111111
# (int) Target Android API, should be as high as possible.
112-
#android.api = 31
112+
#android.api = 33
113113

114114
# (int) Minimum API your APK / AAB will support.
115115
#android.minapi = 21

buildozer/target.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def cmd_release(self, *args):
114114
error("")
115115
error("ERROR: Trying to release a package that starts with org.test")
116116
error("")
117-
error("The package.domain org.test is, as the name intented, a test.")
117+
error("The package.domain org.test is, as the name intended, a test.")
118118
error("Once you published an application with org.test,")
119119
error("you cannot change it, it will be part of the identifier")
120120
error("for Google Play / App Store / etc.")

buildozer/targets/android.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from platform import uname
1111
WSL = 'microsoft' in uname()[2].lower()
1212

13-
ANDROID_API = '31'
13+
ANDROID_API = '33'
1414
ANDROID_MINAPI = '21'
1515
APACHE_ANT_VERSION = '1.9.4'
1616

@@ -323,11 +323,9 @@ def _p4a_have_aab_support(self):
323323
returncode = self._p4a(
324324
["aab", "-h"],
325325
break_on_error=False,
326+
show_output=False,
326327
env=self.buildozer.environ).return_code
327-
if returncode == 0:
328-
return True
329-
else:
330-
return False
328+
return returncode == 0
331329

332330
def _set_win32_java_home(self):
333331
if 'JAVA_HOME' in self.buildozer.environ:

docs/source/quickstart.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ Init and build for Android
2222
at least change the :class:`title`, :class:`package.name` and :class:`package.domain` in the
2323
:class:`[app]` section.
2424

25-
#. Start a Android/debug build with::
25+
#. Start an Android/debug build with::
2626

2727
buildozer -v android debug
2828

2929
#. Now it's time for a coffee / tea, or a dinner if you have a slow computer.
3030
The first build will be slow, as it will download the Android SDK, NDK, and
31-
others tools needed for the compilation.
32-
Don't worry, thoses files will be saved in a global directory and will be
33-
shared across the different project you'll manage with Buildozer.
31+
other tools needed for the compilation.
32+
Don't worry, those files will be saved in a global directory and will be
33+
shared across the different projects you'll manage with Buildozer.
3434

3535
#. At the end, you should have an APK or AAB file in the :class:`bin/` directory.
3636

0 commit comments

Comments
 (0)