Merge pull request #1627 from nextcloud/AS300beta7

tobiasKaminsky · web-flow · commit 3479328a80c1 · 2017-10-09T07:57:59.000+02:00
Updating gradle-plugin to 3.0.0-beta7 + forced move buildToolsVersion 26.0.2
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
@@ -65,7 +65,7 @@ android {
     }
 
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 511 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 510 warnings</span>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ buildscript {`
`14`	`14`	`google()`
`15`	`15`	`}`
`16`	`16`	`dependencies {`
`17`		`- classpath 'com.android.tools.build:gradle:3.0.0-beta6'`
	`17`	`+ classpath 'com.android.tools.build:gradle:3.0.0-beta7'`
`18`	`18`	`classpath 'com.google.gms:google-services:3.0.0'`
`19`	`19`	`}`
`20`	`20`	`}`
`@@ -65,7 +65,7 @@ android {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`compileSdkVersion 25`
`68`		`- buildToolsVersion '25.0.2'`
	`68`	`+ buildToolsVersion '26.0.2'`
`69`	`69`
`70`	`70`	`defaultConfig {`
`71`	`71`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`DO NOT TOUCH; GENERATED BY DRONE`
`2`		`- <span class="mdl-layout-title">Lint Report: 511 warnings</span>`
	`2`	`+ <span class="mdl-layout-title">Lint Report: 510 warnings</span>`