Add separate build flavor for Play without REQUEST_INSTALL_PACKAGES p…

…ermission

.github/workflows/build-android.yml

@@ -44,7 +44,7 @@ jobs:
 
       - name: Build with Gradle
         run: |
-          ./gradlew :android:packageRelease
+          ./gradlew :android:packageFossRelease
           ./gradlew --stop
 
       - name: Upload Logs

.gitignore

@@ -53,3 +53,5 @@ bin/
 /.idea/deploymentTargetDropDown.xml
 /.kotlin/
 /.idea/appInsightsSettings.xml
+/android/foss/
+/android/play/

android/build.gradle.kts

@@ -37,16 +37,20 @@ android {
 
         setProperty("archivesBaseName", "HINT_Control_$versionName")
     }
+    packaging {
+        resources.excludes.add("META-INF/AL2.0")
+        resources.excludes.add("META-INF/LGPL2.1")
+    }
     compileOptions {
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion
     }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
-    }
     buildFeatures {
         buildConfig = true
     }
+    flavorDimensions += "version"
+    productFlavors {
+        create("foss")
+        create("play")
+    }
 }

android/src/main/AndroidManifest.xml

@@ -1,10 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application
-            android:theme="@style/AppTheme"
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher_round" />
 </manifest>

android/src/play/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
+</manifest>

common/src/androidMain/AndroidManifest.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:supportsRtl="true"
         android:usesCleartextTraffic="true"
         android:label="@string/app_name"
-        android:name="dev.zwander.common.App">
+        android:name="dev.zwander.common.App"
+        android:theme="@style/AppTheme"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round">
         <!--suppress AndroidDomInspection -->
         <activity android:name="dev.zwander.android.MainActivity" android:exported="true"
             android:configChanges="colorMode