mirror of
https://github.com/vector-im/riotX-android
synced 2025-10-06 00:02:48 +02:00
Compare commits
3 Commits
v1.4.10
...
feature/ad
Author | SHA1 | Date | |
---|---|---|---|
|
f739ca1cc8 | ||
|
56c11b1e5e | ||
|
dbfebaf908 |
1
changelog.d/5668.misc
Normal file
1
changelog.d/5668.misc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Improving build speed after committing or changing branches by removing git sha information from debug builds
|
@@ -33,10 +33,6 @@ android {
|
|||||||
|
|
||||||
buildConfigField "String", "SDK_VERSION", "\"1.4.10\""
|
buildConfigField "String", "SDK_VERSION", "\"1.4.10\""
|
||||||
|
|
||||||
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
|
|
||||||
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
|
|
||||||
buildConfigField "String", "GIT_SDK_REVISION_DATE", "\"${gitRevisionDate()}\""
|
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
consumerProguardFiles 'proguard-rules.pro'
|
consumerProguardFiles 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
@@ -53,11 +49,19 @@ android {
|
|||||||
buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData")
|
buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData")
|
||||||
// Set to BODY instead of NONE to enable logging
|
// Set to BODY instead of NONE to enable logging
|
||||||
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level." + project.property("vector.httpLogLevel")
|
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level." + project.property("vector.httpLogLevel")
|
||||||
|
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION", "\"dev\""
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"dev\""
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION_DATE", "\"dev\""
|
||||||
}
|
}
|
||||||
|
|
||||||
release {
|
release {
|
||||||
buildConfigField "boolean", "LOG_PRIVATE_DATA", "false"
|
buildConfigField "boolean", "LOG_PRIVATE_DATA", "false"
|
||||||
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.BASIC"
|
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.BASIC"
|
||||||
|
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
|
||||||
|
buildConfigField "String", "GIT_SDK_REVISION_DATE", "\"${gitRevisionDate()}\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -131,14 +131,6 @@ android {
|
|||||||
// Required for sonar analysis
|
// Required for sonar analysis
|
||||||
versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
|
versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
|
||||||
|
|
||||||
// Generate a random app task affinity
|
|
||||||
manifestPlaceholders = [appTaskAffinitySuffix:"H_${gitRevision()}"]
|
|
||||||
|
|
||||||
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
|
|
||||||
buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
|
|
||||||
buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
|
|
||||||
buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
|
|
||||||
|
|
||||||
buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.FTUE_AUTH"
|
buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.FTUE_AUTH"
|
||||||
|
|
||||||
buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
|
buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
|
||||||
@@ -232,6 +224,13 @@ android {
|
|||||||
buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
|
buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
|
||||||
buildConfigField "Boolean", "ENABLE_LIVE_LOCATION_SHARING", "true"
|
buildConfigField "Boolean", "ENABLE_LIVE_LOCATION_SHARING", "true"
|
||||||
|
|
||||||
|
// using static values to avoid cache misses on new commits
|
||||||
|
manifestPlaceholders = [appTaskAffinitySuffix: "H_aaaaaa"]
|
||||||
|
buildConfigField "String", "GIT_REVISION", "\"dev\""
|
||||||
|
buildConfigField "String", "GIT_REVISION_DATE", "\"dev\""
|
||||||
|
buildConfigField "String", "GIT_BRANCH_NAME", "\"dev\""
|
||||||
|
buildConfigField "String", "BUILD_NUMBER", "\"dev\""
|
||||||
|
|
||||||
signingConfig signingConfigs.debug
|
signingConfig signingConfigs.debug
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,6 +241,13 @@ android {
|
|||||||
buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
|
buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
|
||||||
buildConfigField "Boolean", "ENABLE_LIVE_LOCATION_SHARING", "false"
|
buildConfigField "Boolean", "ENABLE_LIVE_LOCATION_SHARING", "false"
|
||||||
|
|
||||||
|
manifestPlaceholders = [appTaskAffinitySuffix:"H_${gitRevision()}"]
|
||||||
|
|
||||||
|
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
|
||||||
|
buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
|
||||||
|
buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
|
||||||
|
buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
|
||||||
|
|
||||||
postprocessing {
|
postprocessing {
|
||||||
removeUnusedCode true
|
removeUnusedCode true
|
||||||
removeUnusedResources true
|
removeUnusedResources true
|
||||||
|
Reference in New Issue
Block a user