Skip to content

Commit

Permalink
[android] Use simple quotes in build.gradle
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-BaptisteC <[email protected]>
  • Loading branch information
Jean-BaptisteC authored Dec 8, 2023
1 parent ac591be commit d83b9e4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@ android {
// For the emulator, chromebooks and some Intel Atom devices.
abiFilters.add('x86_64')
}
println("Building for " + abiFilters + " archs.")
println('Building for ' + abiFilters + ' archs.')
}

setProperty("archivesBaseName", appName.replaceAll("\\s","") + "-" + defaultConfig.versionCode)
setProperty('archivesBaseName', appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode)

if (!androidAutoEnabled) {
sourceSets.main.java.excludes += '**/organicmaps/car'
Expand All @@ -250,26 +250,26 @@ android {
final int HUAWEI_VERSION_CODE_BASE = 01_00_00_00_00

google {
dimension "default"
dimension 'default'
versionName = android.defaultConfig.versionName + '-Google'
buildConfigField 'String', 'SUPPORT_MAIL', '"[email protected]"'
buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.organicmaps"'
}

web {
dimension "default"
dimension 'default'
versionName = android.defaultConfig.versionName + '-Web'
buildConfigField 'String', 'SUPPORT_MAIL', '"[email protected]"'
}

fdroid {
dimension "default"
dimension 'default'
versionName = android.defaultConfig.versionName + '-FDroid'
buildConfigField 'String', 'SUPPORT_MAIL', '"[email protected]"'
}

huawei {
dimension "default"
dimension 'default'
versionName = android.defaultConfig.versionName + '-Huawei'
versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode
buildConfigField 'String', 'SUPPORT_MAIL', '"[email protected]"'
Expand All @@ -285,7 +285,7 @@ android {

splits.abi {
boolean enabled = project.hasProperty('splitApk')
println ("Create separate apks: " + enabled)
println ('Create separate apks: ' + enabled)
enable enabled
reset()
include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64'
Expand Down Expand Up @@ -395,7 +395,7 @@ android {
// A new beta release is created for each commit.
// Use the last commit message for the release notes.
releaseNotes = getCommitMessage()
groups = "qa" // Notify only selected people.
groups = 'qa' // Notify only selected people.
serviceCredentialsFile = "$projectDir/firebase-app-distribution.json"
}
}
Expand All @@ -404,9 +404,9 @@ android {

externalNativeBuild {
cmake {
version "3.22.1+"
buildStagingDirectory "./nativeOutputs"
path "../../CMakeLists.txt"
version '3.22.1+'
buildStagingDirectory './nativeOutputs'
path '../../CMakeLists.txt'
}
}

Expand Down Expand Up @@ -456,15 +456,15 @@ task prepareGoogleReleaseListing {
final sourceDir = new File("${projectDir}/src/$sourceFlavor/play/listings")
final targetDir = new File("${projectDir}/src/$targetFlavor/play/listings")
final sourceFiles = fileTree(dir: sourceDir,
include: "**/*.txt", exclude: "**/*-${targetFlavor}.txt")
include: '**/*.txt', exclude: "**/*-${targetFlavor}.txt")
sourceFiles.each { File sourceFile ->
final locale = sourceFile.parentFile.getName()
final targetLocaleDir = new File(targetDir, locale)
if (!targetLocaleDir.isDirectory())
targetLocaleDir.mkdirs()
final targetFile = new File(targetLocaleDir, sourceFile.getName())
// Override Google-specific values by using ${name}-google.txt files.
final overrideFile = new File(sourceFile.getPath().replace(".txt", "-${targetFlavor}.txt"))
final overrideFile = new File(sourceFile.getPath().replace('.txt', "-${targetFlavor}.txt"))
targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text
}
copy {
Expand All @@ -476,11 +476,11 @@ task prepareGoogleReleaseListing {

play {
enabled.set(false)
track.set("production")
track.set('production')
userFraction.set(Double.valueOf(0.10)) // 10%
defaultToAppBundles.set(true)
releaseStatus.set(ReleaseStatus.IN_PROGRESS)
serviceAccountCredentials.set(file("google-play.json"))
serviceAccountCredentials.set(file('google-play.json'))
}

huaweiPublish {
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pluginManagement {
// mavenCentral()
// }
//}
rootProject.name = "Organic Maps"
rootProject.name = 'Organic Maps'
include ':app'

0 comments on commit d83b9e4

Please sign in to comment.