diff options
author | Allan Wang <me@allanwang.ca> | 2018-09-26 14:56:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-26 14:56:44 -0400 |
commit | 438affb07ae106e490884fafa3c2dd825e7649a4 (patch) | |
tree | b94e182bf4d083af049120a6b5f94f82c4595318 /app/build.gradle | |
parent | c5e769deabeb80d7257b85c5c3d802cf46e6b191 (diff) | |
download | frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.gz frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.bz2 frost-438affb07ae106e490884fafa3c2dd825e7649a4.zip |
Cleanup (#1087)
* Feature/download manager (#855)
* Add initial github release check
* Create update service
* Clean old manager directory
* Update kau
* Update updateActivity snippet
* Add back gradle keys
* Remove update service functionality
* Update changelog
* Misc (#865)
* Clean up git code
* Update download link
* Update theme
* Reorder settings, resolvees #856
* Do not log undeliverable exception
* Handle potential lack of webview
* Set notification epoch default to now, resolves #857
* Fix notification epoch time init
* Update changelog
* Update theme
* Add slack url, resolves #880
* Prepare for image update
* Fix view full image (#882)
* Test including full photo viewer
* Test cookie in glide
* Fix parser and add redirects to view full image
* Update changelog
* Fix compilation and add new keys
* Update all versions
* Fix signing configs
* Fix exoplayer api update
* Change string usage
* Test scss on travis
* Test with node_js flag
* Add back css
* Update versions and fix video view
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/app/build.gradle b/app/build.gradle index aa5a776e..b4a3a42e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,13 @@ android { textOutput 'stdout' } - def withReleaseSigning = file('../files/release.keystore').exists() + def testKeystoreFile = file('../files/test.keystore') + def testPropFile = file('../files/test.properties') + def withTestSigning = testKeystoreFile.exists() && testPropFile.exists() + + def releaseKeystoreFile = file('../files/release.keystore') + def releasePropFile = file('../files/release.properties') + def withReleaseSigning = releaseKeystoreFile.exists() && releasePropFile.exists() signingConfigs { @@ -54,19 +60,24 @@ android { keyPassword "debugKey" } - test { - storeFile file("../files/test.keystore") - storePassword "testkey" - keyAlias "testKey" - keyPassword "testkey" + if (withTestSigning) { + def testProps = new Properties() + testPropFile.withInputStream { testProps.load(it) } + + test { + storeFile testKeystoreFile + storePassword testProps.getProperty('storePassword') + keyAlias testProps.getProperty('keyAlias') + keyPassword testProps.getProperty('keyPassword') + } } if (withReleaseSigning) { def releaseProps = new Properties() - file("../files/release.properties").withInputStream { releaseProps.load(it) } + releasePropFile.withInputStream { releaseProps.load(it) } release { - storeFile file("../files/release.keystore") + storeFile releaseKeystoreFile storePassword releaseProps.getProperty('storePassword') keyAlias releaseProps.getProperty('keyAlias') keyPassword releaseProps.getProperty('keyPassword') @@ -92,7 +103,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' applicationIdSuffix ".test" versionNameSuffix "-test" - signingConfig signingConfigs.test + if (withTestSigning) signingConfig signingConfigs.test resValue "string", "frost_name", "Frost Test" resValue "string", "frost_web", "Frost Web Test" } @@ -159,14 +170,14 @@ dependencies { implementation "com.devbrackets.android:exomedia:${EXOMEDIA}" - implementation"com.mikepenz:fastadapter-extensions:${kau.fastAdapter}@aar" + implementation "com.mikepenz:fastadapter-extensions:${kau.fastAdapter}@aar" //noinspection GradleDependency implementation "com.github.bumptech.glide:okhttp3-integration:${kau.glide}" //noinspection GradleDependency kapt "com.github.bumptech.glide:compiler:${kau.glide}" - implementation "com.fasterxml.jackson.core:jackson-databind:2.9.3" + implementation "com.fasterxml.jackson.core:jackson-databind:${JACKSON}" //noinspection GradleDependency releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}" |