Skip to content

Commit

Permalink
Upgrade tools
Browse files Browse the repository at this point in the history
  • Loading branch information
vRallev committed Aug 18, 2017
1 parent e95a707 commit 0c31c79
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
buildscript {
ext.kotlinVersion = '1.1.2'
ext.kotlinVersion = '1.1.4-2'
ext.useRetroLambda = true

repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

if (project.ext.useRetroLambda) {
Expand All @@ -20,6 +21,7 @@ allprojects {
repositories {
jcenter()
mavenCentral()
google()
}

tasks.withType(JavaCompile) {
Expand All @@ -28,19 +30,19 @@ allprojects {
}

ext {
compileSdkVersion = 25
compileSdkVersion = 26
targetSdkVersion = compileSdkVersion
minSdkVersion = 14

buildToolsVersion = '25.0.2'
buildToolsVersion = '26.0.1'

supportLibVersion = '25.3.1'
supportLibVersion = '26.0.1'
junitVersion = '4.12'
assertjVersion = '3.6.2'
lintVersion = '25.3.0'
}

task wrapper(type: Wrapper) {
gradleVersion = '3.5'
gradleVersion = '4.1'
distributionType = 'ALL'
}
8 changes: 4 additions & 4 deletions gradle/gradle-quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ task findbugs(type: FindBugs) {
html.enabled = true

xml {
destination "$project.buildDir/reports/findbugs/findbugs.xml"
destination file("$project.buildDir/reports/findbugs/findbugs.xml")
xml.withMessages true
}
html {
destination "$project.buildDir/reports/findbugs/findbugs.html"
destination file("$project.buildDir/reports/findbugs/findbugs.html")
}
}

Expand All @@ -57,10 +57,10 @@ task pmd(type: Pmd) {
html.enabled = true

xml {
destination "$project.buildDir/reports/pmd/pmd.xml"
destination file("$project.buildDir/reports/pmd/pmd.xml")
}
html {
destination "$project.buildDir/reports/pmd/pmd.html"
destination file("$project.buildDir/reports/pmd/pmd.html")
}
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri May 12 17:30:09 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit 0c31c79

Please sign in to comment.