Skip to content

feat: upgrade to Ulmo release #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: release
Choose a base branch
from
Open

feat: upgrade to Ulmo release #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df473bb
Merge pull request #43 from overhangio/muqadim/upgrade-android-sdk-to…
Abdul-Muqadim-Arbisoft Nov 6, 2025
365de09
Merge pull request #44 from overhangio/muqadim/fix-android-dockerfile…
Abdul-Muqadim-Arbisoft Nov 6, 2025
5ca8716
feat: upgrade to Ulmo release
Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-21.0.0'></a>
## v21.0.0 (2025-11-10)

- [Improvement] Migrate from pylint and black to ruff. (by @Abdul-Muqadim-Arbisoft)
- [Improvement] Test python package distribution build when running make test. (by @Abdul-Muqadim-Arbisoft)

- [Improvement] Upgraded Android build configuration to use latest SDK and API versions (`ANDROID_API_LEVEL=36`, `ANDROID_SDK_VERSION=13114758`) to ensure compatibility with the latest Android tools. (by @Abdul-Muqadim-Arbisoft)

- [Bugfix] Fix Android build on Apple Silicon by forcing the base Docker image to use `linux/amd64`, ensuring Android SDK and Gradle tools run correctly across all platforms. (by @Abdul-Muqadim-Arbisoft)

- 💥[Feature] Upgrade to Ulmo. (by @Abdul-Muqadim-Arbisoft)

<a id='changelog-20.0.0'></a>
## v20.0.0 (2025-06-10)

Expand Down
2 changes: 0 additions & 2 deletions changelog.d/20250907_194312_abdul.muqadim_migrate_ruff.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"tutor>=20.0.0,<21.0.0"
"tutor>=21.0.0,<22.0.0"
]
# Version will be dynamically loaded from __about__.py
dynamic = ["version"]

[project.optional-dependencies]
dev = [
"tutor[dev]>=20.0.0,<21.0.0",
"tutor[dev]>=21.0.0,<22.0.0",
"ruff",
]

Expand Down
2 changes: 1 addition & 1 deletion tutorandroid/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "20.0.0"
__version__ = "21.0.0"
6 changes: 3 additions & 3 deletions tutorandroid/templates/android/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM docker.io/ubuntu:24.04 AS base
FROM --platform=linux/amd64 docker.io/ubuntu:24.04 AS base
LABEL maintainer="Overhang.IO <[email protected]>"

ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -16,7 +16,7 @@ FROM base AS sdk
# Install Android SDK
# Inspired from https://github.com/LiveXP/docker-android-sdk/blob/master/Dockerfile
# Get sdk version from here: https://developer.android.com/studio#command-tools
ENV ANDROID_SDK_VERSION=11076708
ENV ANDROID_SDK_VERSION=13114758
ENV ANDROID_SDK_PATH=/app/android-sdk
ENV ANDROID_HOME=/app/android-sdk
RUN mkdir ${ANDROID_HOME}
Expand All @@ -28,7 +28,7 @@ RUN wget --quiet https://dl.google.com/android/repository/commandlinetools-linux
# Accept licenses
# https://developer.android.com/studio/command-line/sdkmanager
# Check target version: https://github.com/edx/edx-app-android/blob/master/constants.gradle
ARG ANDROID_API_LEVEL=34
ARG ANDROID_API_LEVEL=36
RUN yes | /app/android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platforms;android-$ANDROID_API_LEVEL" 1> /dev/null

###### Checkout code
Expand Down
Loading