Skip to content

Commit

Permalink
fix: updated gradle dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renard314 committed Jan 25, 2018
1 parent 6687aa7 commit 20aa70f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'checkstyle'


def versions = ['appcompat_v7' : '25.1.0',
'butterknife' : '8.4.0',
'leak_canary' : '1.5',
'card_view' : '25.1.0',
'design' : '25.1.0',
'photoview' : '1.2.4',
'play_services': '10.0.1']
'play_services': '10.2.4']



task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/checkstyle/checkstyle.xml")
configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath
// Where is my suppressions file for checkstyle is...
source 'src'
include '**/*.java'
exclude '**/gen/**'
Expand All @@ -26,7 +25,7 @@ task checkstyle(type: Checkstyle) {

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion '26.0.2'

dexOptions {
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
Expand Down Expand Up @@ -79,14 +78,15 @@ android {
project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 0) * 100 + android.defaultConfig.versionCode
}
}

flavorDimensions "mode"

productFlavors {

playstore {

dimension "mode"
}
develop {
dimension "mode"
}
}

Expand All @@ -102,7 +102,7 @@ android {
}
}

def Properties props = new Properties()
Properties props = new Properties()
def propFile = new File('signing.properties')
if (propFile.canRead()) {
props.load(new FileInputStream(propFile))
Expand Down Expand Up @@ -133,13 +133,12 @@ dependencies {
releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leak_canary}"
compile 'com.viewpagerindicator:library:2.4.1@aar'
compile "com.commit451:PhotoView:${versions.photoview}"
compile 'com.google.code.findbugs:jsr305:2.0.2'
compile "com.google.guava:guava:18.0"
compile 'com.google.code.findbugs:jsr305:3.0.1'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.nineoldandroids:library:2.4.0'
compile "com.android.support:design:${versions.design}"
compile "com.android.support:appcompat-v7:${versions.appcompat_v7}"
compile 'org.apache.commons:commons-compress:1.5'
compile 'org.apache.commons:commons-compress:1.12'
compile "com.android.support:cardview-v7:${versions.card_view}"
compile "com.jakewharton:butterknife:${versions.butterknife}"
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
Expand Down Expand Up @@ -170,3 +169,4 @@ crashlytics {
androidNdkOut '/Users/renard/devel/textfairy/tess-two/tess-two/obj'
androidNdkLibsOut '/Users/renard/devel/textfairy/tess-two/tess-two/libs'
}
apply plugin: 'com.google.gms.google-services'
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'io.fabric.tools:gradle:1+'
classpath 'com.google.gms:google-services:1.3.0-beta1'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'io.fabric.tools:gradle:1.21.5'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Aug 05 23:27:29 CEST 2017
#Wed Jan 24 12:33:27 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
2 changes: 1 addition & 1 deletion perf-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle-experimental:2.3.3'
classpath 'com.android.tools.build:gradle-experimental:3.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit 20aa70f

Please sign in to comment.