From 1fb8bddf544476fa97d2db764391b6982855eab7 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 11:07:47 -0500 Subject: [PATCH 1/2] Upgrade android gradle and dependencies --- app/build.gradle | 18 +++++++++--------- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 app/build.gradle mode change 100644 => 100755 build.gradle diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index cba54cd5..4d99286e --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.example.android.classicalmusicquiz" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,12 +20,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.google.android.exoplayer:exoplayer:r2.2.0' - compile 'com.android.support:appcompat-v7:25.3.0' - testCompile 'junit:junit:4.12' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.google.android.exoplayer:exoplayer:2.8.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' } diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 1ea4bd05..44bac8f9 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7aff1511..5afc033d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 07 11:16:24 PST 2017 +#Fri May 18 11:01:52 CDT 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.4-all.zip From edf747c147d21c8666fa4171eef0028ddbb6fd81 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 13:08:37 -0500 Subject: [PATCH 2/2] Add //noinspection GradleCompatible --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 4d99286e..819b27ad 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'com.google.android.exoplayer:exoplayer:2.8.0' + //noinspection GradleCompatible implementation 'com.android.support:appcompat-v7:27.1.1' testImplementation 'junit:junit:4.12' implementation 'com.android.support.constraint:constraint-layout:1.1.0'