From fbda5f9a877d207808633601879455db12d8f547 Mon Sep 17 00:00:00 2001 From: Oscar S Date: Wed, 5 Sep 2018 23:10:13 -0400 Subject: [PATCH] chore: Compiled with Android SDK 28. Upgraded Firebase core to latest version, added Firebase Crashlytics. --- app/app.iml | 156 ++++++++++++++--------- app/build.gradle | 25 ++-- build.gradle | 20 ++- gradle/wrapper/gradle-wrapper.properties | 4 +- 4 files changed, 129 insertions(+), 76 deletions(-) diff --git a/app/app.iml b/app/app.iml index c10f389..2d22569 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -9,7 +9,6 @@ - + + - + + - + - @@ -56,95 +56,129 @@ - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index cf7314a..7186a94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,16 @@ apply plugin: 'com.android.application' +apply plugin: 'io.fabric' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { applicationId "com.oscarsalguero.colorextractor" minSdkVersion 21 - targetSdkVersion 25 - versionCode 4 - versionName "1.3" + targetSdkVersion 28 + versionCode 5 + versionName "1.5" multiDexEnabled true } buildTypes { @@ -21,12 +22,14 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.2.0' - compile 'com.android.support:design:25.2.0' - compile 'com.android.support:palette-v7:25.2.0' - compile 'com.google.firebase:firebase-core:10.2.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'com.android.support:design:28.0.0-rc01' + implementation 'com.android.support:palette-v7:28.0.0-rc02' + implementation 'com.google.firebase:firebase-core:16.0.3' + implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5' + + testImplementation 'junit:junit:4.12' } apply plugin: 'com.google.gms.google-services' diff --git a/build.gradle b/build.gradle index 8943770..f7ccbd0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,18 +3,34 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + maven { + url 'https://maven.fabric.io/public' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - classpath 'com.google.gms:google-services:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files + // Check for v3.1.2 or higher + classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.google.gms:google-services:4.1.0' + classpath 'io.fabric.tools:gradle:1.25.4' } } allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + maven { + url 'https://maven.google.com/' + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2850fc7..1e46c63 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 22 00:00:25 EST 2017 +#Wed Sep 05 22:59:19 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip