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 #6145 from gwicks/android-buildupdate 

Android: Update gradle version to 4.1 and plugin to 3.0
This commit is contained in:
Anthony 2017-10-27 10:59:55 -07:00 committed by GitHub
parent 802fda26ab cf57e90986
commit 5d449c00e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,22 +75,22 @@ ext {
} }
dependencies { dependencies {
compile "com.android.support:support-v13:$androidSupportVersion" api "com.android.support:support-v13:$androidSupportVersion"
compile "com.android.support:cardview-v7:$androidSupportVersion" api "com.android.support:cardview-v7:$androidSupportVersion"
compile "com.android.support:recyclerview-v7:$androidSupportVersion" api "com.android.support:recyclerview-v7:$androidSupportVersion"
compile "com.android.support:design:$androidSupportVersion" api "com.android.support:design:$androidSupportVersion"
// Android TV UI libraries. // Android TV UI libraries.
compile "com.android.support:leanback-v17:$androidSupportVersion" api "com.android.support:leanback-v17:$androidSupportVersion"
// 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' api 'de.hdodenhof:circleimageview:2.1.0'
// For loading huge screenshots from the disk. // For loading huge screenshots from the disk.
compile 'com.squareup.picasso:picasso:2.5.2' api 'com.squareup.picasso:picasso:2.5.2'
// Allows FRP-style asynchronous operations in Android. // Allows FRP-style asynchronous operations in Android.
compile 'io.reactivex:rxandroid:1.2.1' api 'io.reactivex:rxandroid:1.2.1'
} }
def getVersion() { def getVersion() {

7
Source/Android/build.gradle
View File

@ -1,17 +1,16 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
} }
} }
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven { google()
url "https://maven.google.com"
}
} }
} }

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

@ -1,6 +1,6 @@
#Sat Mar 04 15:47:41 CET 2017 #Thu Oct 26 18:12:18 EDT 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-3.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip