Do some fixes with my last 2 working braincells.

pull/27/head
Fox2Code 3 years ago
parent 876b7987ff
commit e0ecd8f960

@ -15,10 +15,13 @@ android {
Properties properties = new Properties() Properties properties = new Properties()
if (project.rootProject.file('local.properties').exists()) { if (project.rootProject.file('local.properties').exists()) {
properties.load(project.rootProject.file('local.properties').newDataInputStream()) properties.load(project.rootProject.file('local.properties').newDataInputStream())
storeFile file(properties.getProperty('keystore.file')) // AndroidStudio generate local.properties, only set values if file is defined.
storePassword properties.getProperty('keystore.password') if (properties.hasProperty('keystore.file')) {
keyAlias 'key0' storeFile file(properties.getProperty('keystore.file'))
keyPassword properties.getProperty('keystore.password') storePassword properties.getProperty('keystore.password')
keyAlias 'key0'
keyPassword properties.getProperty('keystore.password')
}
} }
} }
} }
@ -167,6 +170,11 @@ aboutLibraries {
additionalLicenses = ["LGPL_3_0_only", "Apache_2_0"] additionalLicenses = ["LGPL_3_0_only", "Apache_2_0"]
} }
configurations {
// Access all imported libraries
compileOnly.extendsFrom(runtimeOnly)
}
// "true" is not allowed inside this block, use "hasSentryConfig" instead. // "true" is not allowed inside this block, use "hasSentryConfig" instead.
// This is because gradle doesn't allow to enable/disable plugins conditionally // This is because gradle doesn't allow to enable/disable plugins conditionally
sentry { sentry {
@ -248,7 +256,7 @@ dependencies {
implementation "dev.rikka.rikkax.insets:insets:1.3.0" implementation "dev.rikka.rikkax.insets:insets:1.3.0"
implementation 'com.github.Dimezis:BlurView:version-2.0.2' implementation 'com.github.Dimezis:BlurView:version-2.0.2'
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1' implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
implementation 'com.github.Fox2Code:FoxCompat:0.1.6' implementation 'com.github.Fox2Code:FoxCompat:0.1.7'
// Update the version code in the root build.gradle // Update the version code in the root build.gradle
implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}" implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
@ -319,3 +327,21 @@ android {
} }
} }
} }
// Safeguard (Do not remove)
final File res = new File(projectDir, "src/main/res")
for (String name : res.list()) {
// Character.isDigit is required to make sure
// we don't confuse "values-vi" as "values-v69"
if (name.startsWith("values-v") &&
Character.isDigit(name.charAt(8))) {
final String ext = name + "/strings.xml"
if (new File(res, ext).exists()) {
final String errMessage =
"String should not be defined in " + ext +
" use values/strings.xml instead"
println(errMessage)
throw new GradleException(errMessage)
}
}
}

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="crash_reporting_desc">If you disable this, the developer will not get automatic bug reports, and this may make troubleshooting harder</string>
<string name="api_key">Androidacy API Key</string>
</resources>

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="crash_reporting_desc">If you disable this, the developer will not get automatic bug reports, and this may make troubleshooting harder</string>
<string name="api_key">Androidacy API Key</string>
</resources>
Loading…
Cancel
Save