update to Android Studio 3.1.1 (halfhp#77)

hannesa2 · halfhp · commit 7893160306fc · 2018-04-22T11:24:06.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -38,9 +38,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.6.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
     }
diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle
@@ -17,9 +17,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.1'
     }
 }
 apply plugin: 'com.android.application'
@@ -54,6 +55,6 @@ android {
 
 dependencies {
     compile project(':androidplot-core')
-    compile 'com.google.android.support:wearable:1.3.0'
+    compile 'com.google.android.support:wearable:2.3.0'
     compile 'com.google.android.gms:play-services-wearable:8.3.0'
 }
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -21,9 +21,9 @@ dependencies {
 	compile project(':androidplot-core')
     compile 'com.crittercism:crittercism-android-agent:5.4.0'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 }
 
 buildscript {
@@ -32,7 +32,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
+        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ buildscript {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`41`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
`42`		`- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`43`		`- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'`
	`41`	`+ classpath 'com.android.tools.build:gradle:3.1.1'`
	`42`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'`
	`43`	`+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'`
`44`	`44`	`classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.6.0'`
`45`	`45`	`classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,10 @@`
`17`	`17`	`buildscript {`
`18`	`18`	`repositories {`
`19`	`19`	`jcenter()`
	`20`	`+ google()`
`20`	`21`	`}`
`21`	`22`	`dependencies {`
`22`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`23`	`+ classpath 'com.android.tools.build:gradle:3.1.1'`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`	`apply plugin: 'com.android.application'`
`@@ -54,6 +55,6 @@ android {`
`54`	`55`
`55`	`56`	`dependencies {`
`56`	`57`	`compile project(':androidplot-core')`
`57`		`- compile 'com.google.android.support:wearable:1.3.0'`
	`58`	`+ compile 'com.google.android.support:wearable:2.3.0'`
`58`	`59`	`compile 'com.google.android.gms:play-services-wearable:8.3.0'`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ dependencies {`
`21`	`21`	`compile project(':androidplot-core')`
`22`	`22`	`compile 'com.crittercism:crittercism-android-agent:5.4.0'`
`23`	`23`
`24`		`- debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'`
`25`		`- releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'`
`26`		`- testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'`
	`24`	`+ debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'`
	`25`	`+ releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'`
	`26`	`+ testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`buildscript {`
`@@ -32,7 +32,7 @@ buildscript {`
`32`	`32`	`mavenCentral()`
`33`	`33`	`}`
`34`	`34`	`dependencies {`
`35`		`- classpath 'com.github.triplet.gradle:play-publisher:1.1.5'`
	`35`	`+ classpath 'com.github.triplet.gradle:play-publisher:1.2.0'`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`