From 96404d74c06aa4ecbf750a340685e39d1017f43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 17 Oct 2024 08:35:13 +0200 Subject: [PATCH 1/5] docs: *.local.edly.io -> *.local.openedx.io The default URL to run a local platform switched from local.edly.io to local.openedx.io. This changes makes it clearer for everyone that Tutor is to run Open edX. See: https://github.com/overhangio/tutor/issues/1120 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a27c8ae..293dd5e 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Enable the plugin and start the platform:: tutor plugins enable android tutor local launch -The ``.apk`` file will then be available for download at http(s)://mobile.LMS_HOST/app.apk. When running locally, this will be: http://mobile.local.edly.io/app.apk. You can forward this address to your students for download. +The ``.apk`` file will then be available for download at http(s)://mobile.LMS_HOST/app.apk. When running locally, this will be: http://mobile.local.openedx.io/app.apk. You can forward this address to your students for download. Building a custom Android app ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 3f19e833009a08795ae8871ad25dc255f0d679a8 Mon Sep 17 00:00:00 2001 From: Abdul-Muqadim-Arbisoft <139064778+Abdul-Muqadim-Arbisoft@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:19:26 +0500 Subject: [PATCH 2/5] feat: ubuntu upgrade (#27) --- changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md | 1 + tutorandroid/templates/android/build/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md diff --git a/changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md b/changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md new file mode 100644 index 0000000..2c2153c --- /dev/null +++ b/changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md @@ -0,0 +1 @@ +-💥[Feature] Update android image to use Ubuntu `24.04` as base OS. (by @Abdul-Muqadim-Arbisoft) \ No newline at end of file diff --git a/tutorandroid/templates/android/build/Dockerfile b/tutorandroid/templates/android/build/Dockerfile index 8a8867a..2579ca4 100644 --- a/tutorandroid/templates/android/build/Dockerfile +++ b/tutorandroid/templates/android/build/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM docker.io/ubuntu:23.10 AS base +FROM docker.io/ubuntu:24.04 AS base LABEL maintainer="Overhang.IO " ENV DEBIAN_FRONTEND=noninteractive From bef534a00d65a8096781d0ae9a171dfd7e83490c Mon Sep 17 00:00:00 2001 From: Abdul-Muqadim-Arbisoft Date: Tue, 29 Oct 2024 23:24:40 +0500 Subject: [PATCH 3/5] v19.0.0 Upgrade to sumac --- changelog.d/20241029_170508_abdul.muqadim_sumac.md | 1 + setup.py | 4 ++-- tutorandroid/__about__.py | 2 +- tutorandroid/templates/android/build/config/tutor.yaml | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 changelog.d/20241029_170508_abdul.muqadim_sumac.md diff --git a/changelog.d/20241029_170508_abdul.muqadim_sumac.md b/changelog.d/20241029_170508_abdul.muqadim_sumac.md new file mode 100644 index 0000000..d1f8a89 --- /dev/null +++ b/changelog.d/20241029_170508_abdul.muqadim_sumac.md @@ -0,0 +1 @@ +- 💥[Feature] Upgrade to Sumac (by @Abdul-Muqadim-Arbisoft) diff --git a/setup.py b/setup.py index 446907a..b8e3478 100644 --- a/setup.py +++ b/setup.py @@ -44,8 +44,8 @@ def load_about(): packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.9", - install_requires=["tutor>=18.0.0,<19.0.0"], - extras_require={"dev": ["tutor[dev]>=18.0.0,<19.0.0"]}, + install_requires=["tutor>=19.0.0,<20.0.0"], + extras_require={"dev": ["tutor[dev]>=19.0.0,<20.0.0"]}, entry_points={ "tutor.plugin.v1": [ "android = tutorandroid.plugin" diff --git a/tutorandroid/__about__.py b/tutorandroid/__about__.py index 28cc149..0122a6f 100644 --- a/tutorandroid/__about__.py +++ b/tutorandroid/__about__.py @@ -1 +1 @@ -__version__ = "18.0.1" +__version__ = "19.0.0" diff --git a/tutorandroid/templates/android/build/config/tutor.yaml b/tutorandroid/templates/android/build/config/tutor.yaml index c284cba..41b52c6 100644 --- a/tutorandroid/templates/android/build/config/tutor.yaml +++ b/tutorandroid/templates/android/build/config/tutor.yaml @@ -68,7 +68,12 @@ BRANCH: ALTERNATE_HOST: '' #Platform names -PLATFORM_NAME: "{{ PLATFORM_NAME }}" +#TODO: Remove the hardcoded value below and replace it with PLATFORM_NAME: "{{ PLATFORM_NAME }}" +#once the PR (https://github.com/openedx/openedx-app-android/pull/335) is merged into the master branch. +#Note: The PR is currently merged into the develop branch. + +#Temporary Hardcoded Value +PLATFORM_NAME: "OpenEdX" PLATFORM_FULL_NAME: "{{ PLATFORM_NAME }}" #App sourceSets dir THEME_DIRECTORY: "openedx" From 5d2e945a15f39c7d242544b149cd450ffc315151 Mon Sep 17 00:00:00 2001 From: Abdul-Muqadim-Arbisoft <139064778+Abdul-Muqadim-Arbisoft@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:07:03 +0500 Subject: [PATCH 4/5] chore: Replace Hardcoded PLATFORM_NAME with Configuration Variable (#29) --- tutorandroid/templates/android/build/config/tutor.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tutorandroid/templates/android/build/config/tutor.yaml b/tutorandroid/templates/android/build/config/tutor.yaml index 41b52c6..9dc6411 100644 --- a/tutorandroid/templates/android/build/config/tutor.yaml +++ b/tutorandroid/templates/android/build/config/tutor.yaml @@ -68,11 +68,7 @@ BRANCH: ALTERNATE_HOST: '' #Platform names -#TODO: Remove the hardcoded value below and replace it with PLATFORM_NAME: "{{ PLATFORM_NAME }}" -#once the PR (https://github.com/openedx/openedx-app-android/pull/335) is merged into the master branch. -#Note: The PR is currently merged into the develop branch. - -#Temporary Hardcoded Value +PLATFORM_NAME: "{{ PLATFORM_NAME }}" PLATFORM_NAME: "OpenEdX" PLATFORM_FULL_NAME: "{{ PLATFORM_NAME }}" #App sourceSets dir From 1d87ec519301452f9dcde4087e06fd1c7562e237 Mon Sep 17 00:00:00 2001 From: Abdul-Muqadim-Arbisoft <139064778+Abdul-Muqadim-Arbisoft@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:57:13 +0500 Subject: [PATCH 5/5] chore: removing hard coded platform name value (#31) --- CHANGELOG.md | 5 +++++ changelog.d/20241029_170508_abdul.muqadim_sumac.md | 1 - tutorandroid/templates/android/build/config/tutor.yaml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/20241029_170508_abdul.muqadim_sumac.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 65405b4..3323d2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes: + +## v19.0.0 (2024-12-09) + +- 💥[Feature] Upgrade to Sumac (by @Abdul-Muqadim-Arbisoft) + ## v18.0.1 (2024-11-28) diff --git a/changelog.d/20241029_170508_abdul.muqadim_sumac.md b/changelog.d/20241029_170508_abdul.muqadim_sumac.md deleted file mode 100644 index d1f8a89..0000000 --- a/changelog.d/20241029_170508_abdul.muqadim_sumac.md +++ /dev/null @@ -1 +0,0 @@ -- 💥[Feature] Upgrade to Sumac (by @Abdul-Muqadim-Arbisoft) diff --git a/tutorandroid/templates/android/build/config/tutor.yaml b/tutorandroid/templates/android/build/config/tutor.yaml index 9dc6411..c5b9e6e 100644 --- a/tutorandroid/templates/android/build/config/tutor.yaml +++ b/tutorandroid/templates/android/build/config/tutor.yaml @@ -69,7 +69,6 @@ BRANCH: #Platform names PLATFORM_NAME: "{{ PLATFORM_NAME }}" -PLATFORM_NAME: "OpenEdX" PLATFORM_FULL_NAME: "{{ PLATFORM_NAME }}" #App sourceSets dir THEME_DIRECTORY: "openedx"