Skip to content

Commit

Permalink
Merge branch 'release/v1.6.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
edipo2s committed Aug 25, 2017
2 parents d9710b7 + 7a8b5ae commit 8490879
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
buildToolsVersion "26.0.1"
packagingOptions.excludes = ['META-INF/services/javax.annotation.processing.Processor',
'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/README.txt',
'META-INF/MANIFEST.MF','LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
'META-INF/MANIFEST.MF', 'LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']

def props = new Properties()
props.load(file("secrets.properties").newInputStream())
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

buildscript {
ext {
appVersionName = "1.6.3"
appVersionCode = 45
appVersionName = "1.6.4"
appVersionCode = 46
prepareToRelease = false

kotlin_version = "1.1.3-2"
Expand All @@ -23,7 +23,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.google.gms:google-services:3.1.0'
classpath ('com.google.firebase:firebase-plugins:1.1.0') {
exclude group: 'com.google.guava', module: 'guava-jdk5'
Expand Down

0 comments on commit 8490879

Please sign in to comment.