mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

avoid clashing buildconfig and moving placeholders to the modules which uses them

Browse source
This commit is contained in:
Adam Brown 2022-08-02 18:06:43 +01:00
parent 2e81056b1e
commit ddaaa1aaeb
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector-app/build.gradle
View file

@ -234,8 +234,6 @@ android {
buildTypes {
debug {
applicationIdSuffix ".debug"
resValue "string", "app_name", "Element dbg"
signingConfig signingConfigs.debug
if (project.hasProperty("coverage")) {
@ -244,7 +242,6 @@ android {
}
release {
resValue "string", "app_name", "Element"
postprocessing {
removeUnusedCode true
removeUnusedResources true
@ -261,9 +258,6 @@ android {
applicationIdSuffix ".nightly"
versionNameSuffix "-nightly"
// Just override the background color of the launcher icon for the nightly build.
resValue "color", "launcher_background", "#07007E"
// We need to copy paste this block, this is not done automatically by `initWith release`
postprocessing {
removeUnusedCode true

3
vector-app/src/gplay/AndroidManifest.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.app">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>

2
vector-app/src/main/AndroidManifest.xml
View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="im.vector.app"/>
<manifest package="im.vector.application"/>

2
vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
View file

@ -28,7 +28,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import im.vector.app.BuildConfig
import im.vector.application.BuildConfig
import im.vector.app.EmojiCompatWrapper
import im.vector.app.EmojiSpanify
import im.vector.app.SpaceStateHandler

9
vector/build.gradle
View file

@ -13,6 +13,11 @@ kapt {
correctErrorTypes = true
}
static def gitRevision() {
def cmd = "git rev-parse --short=8 HEAD"
return cmd.execute().text.trim()
}
project.android.buildTypes.all { buildType ->
buildType.javaCompileOptions.annotationProcessorOptions.arguments =
[
@ -39,6 +44,8 @@ android {
abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
}
// Generate a random app task affinity
manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
// The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures
@ -64,6 +71,8 @@ android {
}
nightly {
initWith release
// Just override the background color of the launcher icon for the nightly build.
resValue "color", "launcher_background", "#07007E"
}
release {
resValue "string", "app_name", "Element"