Merge branch 'master' into dev

pull/316/head^2
Alinson S. Xavier 8 years ago
commit 125a574ff9

1
.gitignore vendored

@ -24,3 +24,4 @@ local.properties
crowdin.yaml crowdin.yaml
local local
tmp/ tmp/
secret/

@ -12,6 +12,7 @@ buildscript {
classpath 'org.jacoco:org.jacoco.core:+' classpath 'org.jacoco:org.jacoco.core:+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath 'org.ajoberstar:grgit:1.5.0' classpath 'org.ajoberstar:grgit:1.5.0'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
} }
} }

@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: 'com.github.triplet.play'
import org.ajoberstar.grgit.Grgit import org.ajoberstar.grgit.Grgit
ext { ext {
@ -15,6 +16,21 @@ android {
compileSdkVersion COMPILE_SDK_VERSION as Integer compileSdkVersion COMPILE_SDK_VERSION as Integer
buildToolsVersion BUILD_TOOLS_VERSION buildToolsVersion BUILD_TOOLS_VERSION
signingConfigs {
release {
storeFile file(LOOP_STORE_FILE)
storePassword LOOP_STORE_PASSWORD
keyAlias LOOP_KEY_ALIAS
keyPassword LOOP_KEY_PASSWORD
}
}
playAccountConfigs {
defaultAccountConfig {
jsonFile = file('../secret/playstore.json')
}
}
defaultConfig { defaultConfig {
versionCode VERSION_CODE as Integer versionCode VERSION_CODE as Integer
versionName "$VERSION_NAME ($GIT_BRANCH $GIT_COMMIT)" versionName "$VERSION_NAME ($GIT_BRANCH $GIT_COMMIT)"
@ -29,12 +45,15 @@ android {
includeCompileClasspath false includeCompileClasspath false
} }
} }
playAccountConfig = playAccountConfigs.defaultAccountConfig
} }
buildTypes { buildTypes {
release { release {
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
signingConfig signingConfigs.release
} }
debug { debug {
@ -165,3 +184,6 @@ task coverageReport(type: JacocoReport) {
} }
} }
play {
track = 'alpha'
}

Loading…
Cancel
Save