kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(build): sync Gradle properties set with current AGP

Browse source
This commit is contained in:
Harsh Shandilya 2023-05-19 21:33:37 +05:30
parent 6b8ca1601d
commit e05c704539
No known key found for this signature in database
5 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle.kts
View file

@ -22,6 +22,7 @@ crowdin {
android { android {
compileOptions { isCoreLibraryDesugaringEnabled = true } compileOptions { isCoreLibraryDesugaringEnabled = true }
namespace = "app.passwordstore"
defaultConfig { defaultConfig {
applicationId = "app.passwordstore" applicationId = "app.passwordstore"
@ -30,13 +31,11 @@ android {
buildFeatures { buildFeatures {
compose = true compose = true
}
composeOptions { composeOptions {
useLiveLiterals = false useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
} }
}
namespace = "app.passwordstore"
} }
dependencies { dependencies {

36
gradle.properties
View file

@ -31,44 +31,28 @@ kapt.include.compile.classpath=false
kotlin.compiler.preciseCompilationResultsBackup=true kotlin.compiler.preciseCompilationResultsBackup=true
kotlin.build.report.output=file kotlin.build.report.output=file
# Use R8 instead of ProGuard for code shrinking.
android.enableR8.fullMode=true
# Enable AndroidX # Enable AndroidX
android.useAndroidX=true android.useAndroidX=true
# Enable non-transitive R class namespacing where each library only contains # Disable mostly unused default Android build features
# references to the resources it declares instead of declarations plus all
# transitive dependency references.
android.nonTransitiveRClass=true
# Only keep the single relevant constructor for types mentioned in XML files
# instead of using a parameter wildcard which keeps them all.
android.useMinimalKeepRules=true
# Enable resource optimizations for release build
android.enableResourceOptimizations=true
# Compatibility with Gradle 8.0
android.experimental.legacyTransform.forceNonIncremental=true
# Default Android build features
android.defaults.buildfeatures.buildconfig=false
android.defaults.buildfeatures.aidl=false
android.defaults.buildfeatures.renderscript=false
android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false android.defaults.buildfeatures.shaders=false
android.library.defaults.buildfeatures.androidresources=false
# Disable warnings about unsupported features, we know what we're doing # Disallow resolution of dependencies at configuration time
android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.experimental.legacyTransform.forceNonIncremental,android.suppressUnsupportedOptionWarnings,android.sdk.channel android.dependencyResolutionAtConfigurationTime.disallow=true
# Disallow parsing the manifest too early in the build process
android.disableEarlyManifestParsing=true
# Disable warnings about unsupported features
android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings
# Maven publishing # Maven publishing
GROUP=com.github.android-password-store GROUP=com.github.android-password-store
# OSSRH sometimes struggles with slow deployments, so this makes Gradle # OSSRH sometimes struggles with slow deployments, so this makes Gradle
# more tolerant to those delays. # more tolerant to those delays.
systemProp.org.gradle.internal.http.connectionTimeout=500000
systemProp.org.gradle.internal.http.socketTimeout=500000
SONATYPE_CONNECT_TIMEOUT_SECONDS=120 SONATYPE_CONNECT_TIMEOUT_SECONDS=120
SONATYPE_CLOSE_TIMEOUT_SECONDS=1800 SONATYPE_CLOSE_TIMEOUT_SECONDS=1800

3
passgen/diceware/build.gradle.kts
View file

@ -8,8 +8,9 @@ plugins {
} }
android { android {
sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
namespace = "app.passwordstore.passgen.diceware" namespace = "app.passwordstore.passgen.diceware"
buildFeatures { androidResources = true }
sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
} }
dependencies { dependencies {

1
ssh/build.gradle.kts
View file

@ -11,6 +11,7 @@ plugins {
android { android {
namespace = "app.passwordstore.ssh" namespace = "app.passwordstore.ssh"
buildFeatures { androidResources = true }
sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } } sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
} }

3
ui-compose/build.gradle.kts
View file

@ -10,11 +10,12 @@ plugins {
android { android {
buildFeatures { buildFeatures {
compose = true compose = true
androidResources = true
}
composeOptions { composeOptions {
useLiveLiterals = false useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
} }
}
namespace = "app.passwordstore.ui.compose" namespace = "app.passwordstore.ui.compose"
} }