diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml new file mode 100644 index 0000000000000000000000000000000000000000..1697e401a91b5584bdfb96bcc62406e11a32dbe7 --- /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 855500be61a02225f35f3b67d38093557887102c..9adcfd56692cb4df268bfbebfbb92295bbdb1d3e 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 - } - } - - } }