wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use latest build-plugin and gradle - remove sdkmanager

Browse source 
sdkmanager is now incompatible and was not supported anymore anyway
This commit is contained in:
ligi 2017-03-04 17:58:12 +01:00
parent 1f4ac8bd7b
commit 3a9d192ba7
No known key found for this signature in database
GPG key ID: 8E81894010ABF23D
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Jenkinsfile vendored
View file

@ -32,8 +32,8 @@ node {
} catch(err) { } catch(err) {
currentBuild.result = FAILURE currentBuild.result = FAILURE
} finally { } finally {
step([$class: 'JUnitResultArchiver', testResults: 'android/build/test-results/*/*/*.xml']) 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']) publishHTML(target:[allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true, reportDir: 'android/build/reports/tests/', reportFiles: "*/index.html", reportName: 'UnitTest'])
} }
stage 'assemble' stage 'assemble'

1
android/build.gradle
View file

@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'spoon' apply plugin: 'spoon'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'

5
build.gradle
View file

@ -14,13 +14,10 @@ buildscript {
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 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.stanfy.spoon:spoon-gradle-plugin:1.2.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'de.mobilej.unmock:UnMockPlugin:0.5.0' classpath 'de.mobilej.unmock:UnMockPlugin:0.5.0'
classpath 'com.github.triplet.gradle:play-publisher:1.1.5' classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
// http://stackoverflow.com/a/33889117/322642
classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Dec 03 19:16:30 CET 2016 #Fri Mar 03 23:10:43 CET 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.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip