From d18e0a05244e517002eb1b52e3613b9a44448940 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 10 Mar 2021 10:10:57 -0500
Subject: [PATCH] Set up for CI

Import some build system patches from fdroid.
---
 .builds/debian-stable.yml | 27 +++++++++++++++++++++++++++
 build.gradle              | 19 +++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 .builds/debian-stable.yml

diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml
new file mode 100644
index 000000000..1697e401a
--- /dev/null
+++ b/.builds/debian-stable.yml
@@ -0,0 +1,27 @@
+image: debian/stable
+sources:
+- https://git.sr.ht/~singpolyma/cheogram-android
+artifacts:
+- cheogram.apk
+packages:
+- wget
+- unzip
+- android-sdk
+environment:
+  ANDROID_SDK_ROOT: /home/build/android
+tasks:
+- sdk: |
+    wget -qO android.zip https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip
+    unzip -qq android.zip
+    mkdir -p android/cmdline-tools
+    mv cmdline-tools android/cmdline-tools/tools
+    echo y | android/cmdline-tools/tools/bin/sdkmanager "platforms;android-29"
+    echo y | android/cmdline-tools/tools/bin/sdkmanager "platform-tools"
+    echo y | android/cmdline-tools/tools/bin/sdkmanager "build-tools;29.0.2"
+    touch ~/.android/repositories.cfg
+    yes | android/cmdline-tools/tools/bin/sdkmanager --licenses
+- build: |
+    cd cheogram-android
+    ./gradlew assembleConversationsFreeCompatDebug
+- assets: |
+    mv cheogram-android/build/outputs/apk/conversationsFreeCompat/debug/*.apk cheogram.apk
diff --git a/build.gradle b/build.gradle
index 855500be6..9adcfd566 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ dependencies {
 
     implementation 'com.google.guava:guava:30.1.1-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.18'
-    implementation fileTree(include: ['libwebrtc-m90.aar'], dir: 'libs')
+    implementation 'org.webrtc:google-webrtc:1.0.32006'
 }
 
 ext {
@@ -103,12 +103,6 @@ android {
         buildConfigField "String", "APP_NAME", "\"$appName\"";
     }
 
-    splits {
-        abi {
-            universalApk true
-            enable true
-        }
-    }
 
     configurations {
         compile.exclude group: 'org.jetbrains' , module:'annotations'
@@ -259,6 +253,7 @@ android {
 
     lintOptions {
         disable 'MissingTranslation', 'InvalidPackage','AppCompatResource'
+        abortOnError false
     }
 
     subprojects {
@@ -269,6 +264,7 @@ android {
 
                 configure(android.lintOptions) {
                     disable 'AndroidGradlePluginVersion', 'MissingTranslation'
+                    abortOnError false
                 }
             }
 
@@ -280,13 +276,4 @@ android {
         exclude 'META-INF/BCKEY.SF'
     }
 
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
-            if (baseAbiVersionCode != null) {
-                output.versionCodeOverride = (100 * variant.versionCode) + baseAbiVersionCode
-            }
-        }
-
-    }
 }
-- 
2.45.2