Skip to content

Commit d8ab0e0

Browse files
committed
Update build configuration for Chaquopy
Update app/build.gradle: - Add Chaquopy Gradle plugin - Configure Python 3.10 with pip dependencies - Add custom Gradle tasks for Kolibri tar patching - Update signing and build type configuration - Add Spotless for Java code formatting Update Java classes with new package declarations: - Utility classes now in org.learningequality.Kolibri.util - Worker classes now in org.learningequality.Kolibri.workers - Notification classes now in org.learningequality.Kolibri.notification - Task classes now in org.learningequality.Kolibri.task Update Python files for Chaquopy integration Update build files: - .gitignore: Add Chaquopy-specific patterns - Makefile: Update build targets for Gradle - requirements.txt: Update Python dependencies - build-requirements.txt: Add build-time dependencies - scripts/create_strings.py: Update for new resource paths - scripts/version.py: Update version calculation - .pre-commit-config.yaml: Update hooks - README.md: Update documentation Part of #197: Migrate App to use Chaquopy
1 parent 61cbf40 commit d8ab0e0

29 files changed

Lines changed: 2032 additions & 1637 deletions

.gitignore

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1-
# A generated source file
2-
src/strings.py
1+
# Generated source files
2+
app/src/main/python/strings.py
3+
app/src/main/res/*/html_content.xml
4+
app/src/main/res/values-*/strings.xml
5+
6+
# Temporary files
37
tmpenv
4-
tar
5-
python-for-android/build/
6-
python-for-android/packages/**
7-
python-for-android/dists/kolibri/_python*
8-
python-for-android/dists/kolibri/.gradle
9-
python-for-android/dists/kolibri/build
10-
python-for-android/dists/kolibri/gradle/*
11-
python-for-android/dists/kolibri/jni
12-
python-for-android/dists/kolibri/libs
13-
python-for-android/dists/kolibri/templates
14-
python-for-android/dists/kolibri/obj
15-
python-for-android/dists/kolibri/src/res_initial
16-
python-for-android/dists/kolibri/src/main/assets/private.tar
17-
python-for-android/dists/kolibri/webview_includes
18-
python-for-android/dists/kolibri/*.*
19-
python-for-android/dists/kolibri/gradlew
20-
python-for-android/dists/kolibri/src/main/res/*/html_content.xml
21-
python-for-android/dists/kolibri/src/main/res/values-*/strings.xml
22-
!python-for-android/dists/kolibri/build.gradle
23-
!python-for-android/dists/kolibri/gradle.properties
24-
25-
# File format for signing key
8+
tmphome/
9+
10+
# Kolibri tar files and patches
11+
tar/
12+
tar/patched/
13+
14+
# File format for signing keys
2615
*.jks
16+
*.keystore
2717

28-
# output folder
18+
# Output folder
2919
dist/
3020

21+
# Python
3122
__pycache__
3223
*.pyc
33-
build_docker
34-
bin/
35-
build.log
36-
tmphome/
37-
android_root/
3824

25+
# Android build artifacts
26+
android_root/
3927
*.apk
28+
bin/
29+
build/
30+
.gradle/
31+
.cxx
32+
.externalNativeBuild
33+
captures/
34+
local.properties
35+
36+
# IDE
37+
.idea/
38+
*.iml
39+
.DS_Store
40+
41+
# Environment
4042
.env
41-
.version-code
42-
*.keystore
4343
.envrc
44-
.idea/
44+
build_docker
45+
build.log

.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,12 @@ repos:
2121
rev: v2.6.0
2222
hooks:
2323
- id: reorder-python-imports
24+
25+
- repo: local
26+
hooks:
27+
- id: spotless
28+
name: spotless (Java/Gradle formatting)
29+
entry: ./gradlew spotlessCheck --no-daemon
30+
language: system
31+
pass_filenames: false
32+
files: \.(java|gradle)$

0 commit comments

Comments
 (0)