diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-10-27 10:59:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 10:59:55 -0700 |
| commit | 5d449c00e63e9e4dceeda1bca385b6831de12e0f (patch) | |
| tree | b9e45f31ca20ae5912f1542a22db0eeea3231fe2 /Source/Android | |
| parent | 802fda26ab0959f92327a37fac966d728c8dcc5f (diff) | |
| parent | cf57e909863634311610ab26125560d854d4636f (diff) | |
Merge pull request #6145 from gwicks/android-buildupdate
Android: Update gradle version to 4.1 and plugin to 3.0
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/build.gradle | 16 | ||||
| -rw-r--r-- | Source/Android/build.gradle | 7 | ||||
| -rw-r--r-- | Source/Android/gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 13 insertions, 14 deletions
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index ae502037b1..3dc43ee8b0 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -75,22 +75,22 @@ ext { } dependencies { - compile "com.android.support:support-v13:$androidSupportVersion" - compile "com.android.support:cardview-v7:$androidSupportVersion" - compile "com.android.support:recyclerview-v7:$androidSupportVersion" - compile "com.android.support:design:$androidSupportVersion" + api "com.android.support:support-v13:$androidSupportVersion" + api "com.android.support:cardview-v7:$androidSupportVersion" + api "com.android.support:recyclerview-v7:$androidSupportVersion" + api "com.android.support:design:$androidSupportVersion" // 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 - compile 'de.hdodenhof:circleimageview:2.1.0' + api 'de.hdodenhof:circleimageview:2.1.0' // 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. - compile 'io.reactivex:rxandroid:1.2.1' + api 'io.reactivex:rxandroid:1.2.1' } def getVersion() { diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index aac9f5bae5..5564f3fa9b 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -1,17 +1,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' } } allprojects { repositories { jcenter() - maven { - url "https://maven.google.com" - } + google() } } diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties index 3fb98131ed..50feb93e15 100644 --- a/Source/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 04 15:47:41 CET 2017 +#Thu Oct 26 18:12:18 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 |