Re-enable CSS compilation in Android app build script

Author: shai-almog

scripts/build-android-app.sh

@@ -14,6 +14,7 @@ TMPDIR="${TMPDIR:-/tmp}"
 TMPDIR="${TMPDIR%/}"
 DOWNLOAD_DIR="${TMPDIR%/}/codenameone-tools"
 ENV_DIR="$DOWNLOAD_DIR/tools"
+EXTRA_MVN_ARGS=("$@")
 
 ensure_workspace() {
   local attempt
@@ -76,18 +77,24 @@ GROUP_ID="com.codenameone.examples"
 ARTIFACT_ID="hello-codenameone"
 MAIN_NAME="HelloCodenameOne"
 
+LOCAL_MAVEN_REPO="${LOCAL_MAVEN_REPO:-$HOME/.m2/repository}"
+log "Using local Maven repository at $LOCAL_MAVEN_REPO"
+MAVEN_CMD=("$MAVEN_HOME/bin/mvn" -Dmaven.repo.local="$LOCAL_MAVEN_REPO")
+
 log "Generating Codename One application skeleton"
-"$MAVEN_HOME/bin/mvn" -q archetype:generate \
+"${MAVEN_CMD[@]}" -q --offline archetype:generate \
   -DarchetypeArtifactId=cn1app-archetype \
   -DarchetypeGroupId=com.codenameone \
   -DarchetypeVersion="$CN1_VERSION" \
+  -DarchetypeCatalog=local \
   -DgroupId="$GROUP_ID" \
   -DartifactId="$ARTIFACT_ID" \
   -Dversion=1.0-SNAPSHOT \
   -DmainName="$MAIN_NAME" \
   -DinteractiveMode=false \
   -Dpackage="$GROUP_ID.$MAIN_NAME" \
-  -DoutputDirectory="$WORK_DIR"
+  -DoutputDirectory="$WORK_DIR" \
+  "${EXTRA_MVN_ARGS[@]}"
 
 APP_DIR="$WORK_DIR/$ARTIFACT_ID"
 if [ ! -d "$APP_DIR" ]; then
@@ -147,7 +154,7 @@ public class ${MAIN_NAME} {
 HELLOEOF
 
 SETTINGS_FILE="$APP_DIR/common/codenameone_settings.properties"
-log "Disabling Codename One CSS compilation for headless build environment"
+log "Ensuring Codename One CSS compilation is enabled"
 if [ -f "$SETTINGS_FILE" ]; then
   if grep -q '^codename1.cssTheme=' "$SETTINGS_FILE"; then
     python3 - "$SETTINGS_FILE" <<'PY'
@@ -157,18 +164,41 @@ import sys
 
 path = pathlib.Path(sys.argv[1])
 text = path.read_text()
-text = re.sub(r'^codename1\.cssTheme=.*$', 'codename1.cssTheme=false', text, flags=re.MULTILINE)
+replacement = 'codename1.cssTheme=true'
+if re.search(r'^codename1\.cssTheme=', text, flags=re.MULTILINE):
+    text = re.sub(r'^codename1\.cssTheme=.*$', replacement, text, flags=re.MULTILINE)
+else:
+    text = text + ('\n' if not text.endswith('\n') else '') + replacement + '\n'
 path.write_text(text if text.endswith('\n') else text + '\n')
 PY
   else
-    printf '\ncodename1.cssTheme=false\n' >> "$SETTINGS_FILE"
+    printf '\ncodename1.cssTheme=true\n' >> "$SETTINGS_FILE"
   fi
 else
-  printf 'codename1.cssTheme=false\n' > "$SETTINGS_FILE"
+  printf 'codename1.cssTheme=true\n' > "$SETTINGS_FILE"
 fi
 
+CSS_DIR="$APP_DIR/common/src/main/css"
+mkdir -p "$CSS_DIR"
+THEME_CSS="$CSS_DIR/theme.css"
+if [ ! -f "$THEME_CSS" ]; then
+  cat > "$THEME_CSS" <<'CSSEOF'
+/* Minimal CSS to ensure the theme compiles during automated builds */
+Form {
+    background-color: #ffffff;
+}
+
+Label {
+    font-size: 2mm;
+}
+CSSEOF
+fi
+
+log "Compiling Codename One CSS theme"
+xvfb-run -a "${MAVEN_CMD[@]}" -q --offline -f "$APP_DIR/pom.xml" codenameone:css "${EXTRA_MVN_ARGS[@]}"
+
 log "Building Android gradle project using Codename One port"
-"$MAVEN_HOME/bin/mvn" -q -f "$APP_DIR/pom.xml" package -DskipTests -Dcodename1.platform=android -Dcodename1.buildTarget=android-source -Dopen=false "$@"
+xvfb-run -a "${MAVEN_CMD[@]}" -q --offline -f "$APP_DIR/pom.xml" package -DskipTests -Dcodename1.platform=android -Dcodename1.buildTarget=android-source -Dopen=false "${EXTRA_MVN_ARGS[@]}"
 
 GRADLE_PROJECT_DIR=$(find "$APP_DIR/target" -maxdepth 1 -type d -name "*-android-source" | head -n 1 || true)
 if [ -z "$GRADLE_PROJECT_DIR" ]; then