rebase to universal apk

.github/workflows/ci.yml

@@ -19,13 +19,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: download base
-        run: wget https://www.dropbox.com/s/2pc77f39z747b6y/twitch-11.2.1.zip\?\dl=1 -O twitch.zip
+        run: wget https://www.dropbox.com/s/jv18rz8j36a9cm2/twitch-11.2.1.apk\?\dl=1 -O twitch.apk
       - name: create keystore.kjs from secret
         run: echo "${{ secrets.KEYSTORE }}" | base64 -d > keystore.jks
       - name: run build
-        run: docker run --rm -v $(pwd)/twitch.zip:/usr/build/twitch.zip -v $(pwd)/dist:/usr/build/dist -v $(pwd)/mod:/usr/build/mod -v $(pwd)/monke.patch:/usr/build/monke.patch -v $(pwd)/keystore.jks:/usr/build/keystore.jks -e KS=/usr/build/keystore.jks -e KSPASS=${{ secrets.KSPASS }} ghcr.io/bttv-android/builder
+        run: docker run --rm -v $(pwd)/twitch.apk:/usr/build/twitch.apk -v $(pwd)/dist:/usr/build/dist -v $(pwd)/mod:/usr/build/mod -v $(pwd)/monke.patch:/usr/build/monke.patch -v $(pwd)/keystore.jks:/usr/build/keystore.jks -e KS=/usr/build/keystore.jks -e KSPASS=${{ secrets.KSPASS }} ghcr.io/bttv-android/builder
       - name: print checksums
-        run: cp dist/twitch.apk bttv.apk && shasum *.apk *.zip
+        run: cp dist/twitch.apk bttv.apk && shasum *.apk
       - uses: actions/upload-artifact@v2
         if: ${{ github.event_name == 'push' }}
         with:

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 # master
 
+# v0.9.2-beta
+- rebase to universal apk
+
 # v0.9.1-beta
 - fix installation issue on some ABIs
 

monke.patch

@@ -7,8 +7,8 @@ index 4d89846ac..d2a4fe1bc 100644
 +<?xml version="1.0" encoding="utf-8" standalone="no"?>
 +<manifest
 +    xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:versionCode="01102000901"
-+    android:versionName="0.9.1-beta"
++    android:versionCode="01102000902"
++    android:versionName="0.9.2-beta"
 +    android:compileSdkVersion="29"
 +    android:compileSdkVersionCodename="10"
 +    android:installLocation="auto"
@@ -155,7 +155,7 @@ index e5846b005..668172a2c 100644
  <LinearLayout android:orientation="vertical" android:id="@id/settings_logout_footer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true"
    xmlns:android="http://schemas.android.com/apk/res/android">
      <ImageView android:layout_gravity="center_horizontal" android:id="@id/app_settings_icon" android:padding="@dimen/default_margin" android:layout_width="@dimen/settings_footer_logo_size" android:layout_height="@dimen/settings_footer_logo_size" android:src="@drawable/ic_twitch_glitch_uv" />
-+    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV v0.9.1" />
++    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV v0.9.2" />
      <TextView android:textColor="@color/text_alt" android:gravity="center" android:id="@id/app_settings_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/version_label" />
      <TextView android:textColor="@color/text_alt" android:gravity="center" android:id="@id/app_settings_build_date" android:layout_width="fill_parent" android:layout_height="wrap_content" />
      <FrameLayout android:id="@id/app_settings_logout_button" android:background="@drawable/settings_logout_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin">