From c1fb15b1359d0f92c7eb535c232358fb4a8b047c Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 24 Jul 2024 13:50:48 -0400
Subject: [PATCH] ci tweaks and aab fixes.

---
 .gitea/workflows/build.yaml     | 10 ++--------
 GNUmakefile                     | 13 +++++++++++--
 src/android/AndroidManifest.xml |  3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index c4da9aa4..6a4835cb 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,21 +1,15 @@
 name: Build Tilde Friends
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+run-name: ${{ gitea.actor }} running 🚀
 on: [push]
 
 jobs:
   Build-All:
     runs-on: ubuntu-latest
     steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
+      - name: check out code
         uses: actions/checkout@v4
         with:
           submodules: true
-      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
       - run: sudo apt update && sudo apt install -y doxygen mingw-w64
       - run: make all -j`nproc` docs
       - run: docker build .
-      - run: echo "🍏 This job's status is ${{ job.status }}."
diff --git a/GNUmakefile b/GNUmakefile
index 07234cf3..861f9b57 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -747,7 +747,16 @@ $(BUNDLETOOL):
 out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGETS)) $(RAW_FILES) out/apk/res.apk src/android/AndroidManifest.xml $(BUNDLETOOL)
 	@rm -rf out/aab/staging/
 	@mkdir -p out/aab/staging
-	@$(ANDROID_BUILD_TOOLS)/aapt2 link --proto-format -o out/aab/temporary.apk -I $(ANDROID_PLATFORM)/android.jar --manifest src/android/AndroidManifest.xml -R out/res/layout_activity_main.xml.flat -R out/res/drawable_icon.xml.flat --auto-add-overlay
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link --proto-format -o out/aab/temporary.apk \
+		-I $(ANDROID_PLATFORM)/android.jar \
+		--version-code $(VERSION_CODE) \
+		--version-name $(VERSION_NUMBER) \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--manifest src/android/AndroidManifest.xml \
+		-R out/res/layout_activity_main.xml.flat \
+		-R out/res/drawable_icon.xml.flat \
+		--auto-add-overlay
 	@unzip out/aab/temporary.apk -d out/aab/staging/
 	@mkdir -p out/aab/staging/root/deps
 	@mkdir -p out/aab/staging/classes
@@ -939,7 +948,7 @@ clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe)
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe)
 	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
 	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index 7214692a..7a9a1c0f 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.unprompted.tildefriends"
-	android:versionName="0.0.21-wip">
+	package="com.unprompted.tildefriends">
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
 		android:label="Tilde Friends"