From 3a9d192ba7a66630dd842a67a9a13c12b1b0b465 Mon Sep 17 00:00:00 2001
From: ligi <ligi@ligi.de>
Date: Sat, 4 Mar 2017 17:58:12 +0100
Subject: [PATCH] Use latest build-plugin and gradle - remove sdkmanager

 sdkmanager is now incompatible and was not supported anymore anyway
---
 Jenkinsfile                              | 4 ++--
 android/build.gradle                     | 1 -
 build.gradle                             | 5 +----
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2676ac4e..2f60c2ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,8 +32,8 @@ node {
   } catch(err) {
    currentBuild.result = FAILURE
   } finally {
-   step([$class: 'JUnitResultArchiver', testResults: 'android/build/test-results/*/*/*.xml'])
-   publishHTML(target:[allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true, reportDir: 'android/build/reports/tests/', reportFiles: "*/*/index.html", reportName: 'UnitTest'])
+   step([$class: 'JUnitResultArchiver', testResults: 'android/build/test-results/*/*.xml'])
+   publishHTML(target:[allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true, reportDir: 'android/build/reports/tests/', reportFiles: "*/index.html", reportName: 'UnitTest'])
   }
   
  stage 'assemble'
diff --git a/android/build.gradle b/android/build.gradle
index 59a2a03f..57fac6f7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.application'
 apply plugin: 'spoon'
 apply plugin: 'kotlin-android'
diff --git a/build.gradle b/build.gradle
index a0e847a4..7faa7262 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,13 +14,10 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.mobilej.unmock:UnMockPlugin:0.5.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
-
-        // http://stackoverflow.com/a/33889117/322642
-        classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc4e8bc0..4eca6018 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 03 19:16:30 CET 2016
+#Fri Mar 03 23:10:43 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip