1
0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-09 12:32:30 +01:00

Fix/travis (#203)

* Add check to see if signing is valid

* Add test keystore
This commit is contained in:
Allan Wang 2017-08-20 00:16:41 -07:00 committed by GitHub
parent 1d56e35c8a
commit 55cda1842f
3 changed files with 25 additions and 17 deletions

View File

@ -8,13 +8,20 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'io.fabric'
apply plugin: 'com.github.triplet.play'
play {
jsonFile = file('../files/gplay-keys.json')
track = 'alpha'
errorOnSizeLimit = true
uploadImages = false
untrackOld = true
}
def withPlaySigning = file('../files.gplay-keys.json').exists()
/*
* Feel free to check the gitignore under the files/ folder to see what is required for the signing
* It is assumed that if one of those files exist, all remaining ones exist as well
*/
if (withPlaySigning)
play {
jsonFile = file('../files/gplay-keys.json')
track = 'alpha'
errorOnSizeLimit = true
uploadImages = false
untrackOld = true
}
android {
compileSdkVersion Integer.parseInt(project.TARGET_SDK)
@ -33,7 +40,6 @@ android {
versionCode androidGitVersion.code()
versionName androidGitVersion.name()
multiDexEnabled true
buildTypeMatching 'release'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@ -53,14 +59,16 @@ android {
signingConfigs {
def releaseProps = new Properties()
file("../files/play.properties").withInputStream { releaseProps.load(it) }
if (withPlaySigning) {
def releaseProps = new Properties()
file("../files/play.properties").withInputStream { releaseProps.load(it) }
release {
storeFile file("../files/play.keystore")
storePassword releaseProps.getProperty('storePassword')
keyAlias releaseProps.getProperty('keyAlias')
keyPassword releaseProps.getProperty('keyPassword')
release {
storeFile file("../files/play.keystore")
storePassword releaseProps.getProperty('storePassword')
keyAlias releaseProps.getProperty('keyAlias')
keyPassword releaseProps.getProperty('keyPassword')
}
}
test {
@ -95,7 +103,7 @@ android {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
if (withPlaySigning) signingConfig signingConfigs.release
resValue "string", "frost_name", "Frost"
resValue "string", "frost_web", "Frost Web"
}

View File

@ -3,6 +3,7 @@
## Beta Updates
* Fix url loading bug and add option to launch urls in default browser (behaviour setting)
* Allow for bottom bar tabs (appearance setting)
* Allow custom ringtones for notifications and messages (notification setting)
## v1.4.7
* Update secondary background for transparent themes to be more visible.

1
files/.gitignore vendored
View File

@ -1,5 +1,4 @@
gplay-keys.json
play.keystore
play.properties
test.keystore
update-dev.sh