ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5013 from degasus/androidstudio 

Android: Update android studio + gradle.
This commit is contained in:
Mat M 2017-03-04 18:41:16 -05:00 committed by GitHub
parent 7304cb0f8e a3f79f88cd
commit 606e25607d
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Android/app/build.gradle
View File

@ -1,9 +1,8 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
// Leanback support requires >22 compileSdkVersion 25
compileSdkVersion 24 buildToolsVersion '25.0.2'
buildToolsVersion '24.0.3'
lintOptions { lintOptions {
// This is important as it will run lint but not abort on error // This is important as it will run lint but not abort on error
@ -73,13 +72,13 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:support-v13:24.2.1' compile 'com.android.support:support-v13:25.2.0'
compile 'com.android.support:cardview-v7:24.2.1' compile 'com.android.support:cardview-v7:25.2.0'
compile 'com.android.support:recyclerview-v7:24.2.1' compile 'com.android.support:recyclerview-v7:25.2.0'
compile 'com.android.support:design:24.2.1' compile 'com.android.support:design:25.2.0'
// Android TV UI libraries. // 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 // For showing the banner as a circle a-la Material Design Guidelines
compile 'de.hdodenhof:circleimageview:2.1.0' compile 'de.hdodenhof:circleimageview:2.1.0'

2
Source/Android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
Source/Android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sat Aug 06 15:24:00 CEST 2016 #Sat Mar 04 15:47:41 CET 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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