diff options
| author | Mat M <mathew1800@gmail.com> | 2017-03-04 18:41:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-04 18:41:16 -0500 |
| commit | 606e25607dd0dfd2b7a0ffa58edf05042abdc31e (patch) | |
| tree | 3e2fe8b29ff2d865dddf815f58932782f2d0423e | |
| parent | 7304cb0f8eb55169f7f601444a1733020fd96e15 (diff) | |
| parent | a3f79f88cdcfd26dc214cc4ee29a08e29474481f (diff) | |
Merge pull request #5013 from degasus/androidstudio
Android: Update android studio + gradle.
| -rw-r--r-- | Source/Android/app/build.gradle | 15 | ||||
| -rw-r--r-- | Source/Android/build.gradle | 2 | ||||
| -rw-r--r-- | Source/Android/gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 359065102c..089c96a055 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.application' android { - // Leanback support requires >22 - compileSdkVersion 24 - buildToolsVersion '24.0.3' + compileSdkVersion 25 + buildToolsVersion '25.0.2' lintOptions { // This is important as it will run lint but not abort on error @@ -73,13 +72,13 @@ android { } dependencies { - compile 'com.android.support:support-v13:24.2.1' - compile 'com.android.support:cardview-v7:24.2.1' - compile 'com.android.support:recyclerview-v7:24.2.1' - compile 'com.android.support:design:24.2.1' + compile 'com.android.support:support-v13:25.2.0' + compile 'com.android.support:cardview-v7:25.2.0' + compile 'com.android.support:recyclerview-v7:25.2.0' + compile 'com.android.support:design:25.2.0' // Android TV UI libraries. - compile 'com.android.support:leanback-v17:24.2.1' + compile 'com.android.support:leanback-v17:25.2.0' // For showing the banner as a circle a-la Material Design Guidelines compile 'de.hdodenhof:circleimageview:2.1.0' diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index f46d6535c5..c6f2f5009e 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties index 2686c8e47b..3fb98131ed 100644 --- a/Source/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 06 15:24:00 CEST 2016 +#Sat Mar 04 15:47:41 CET 2017 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-3.4.1-all.zip |