Skip to content
This repository has been archived by the owner on Apr 19, 2018. It is now read-only.

Fix preview build tools availability check and download #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,20 @@ class PackageResolver {
def buildToolsRevision = project.android.buildToolsRevision
log.debug "Build tools version: $buildToolsRevision"

def buildToolsRevisionDir = new File(buildToolsDir, buildToolsRevision.toString())
def buildToolsRevisionName = buildToolsRevision.toString()
if (buildToolsRevisionName.contains(" rc")) {
// Fix folder name for preview build tools
buildToolsRevisionName = buildToolsRevisionName.replaceAll(" rc.*", "-preview")
}
def buildToolsRevisionDir = new File(buildToolsDir, buildToolsRevisionName)
if (folderExists(buildToolsRevisionDir)) {
log.debug 'Build tools found!'
return
}

log.lifecycle "Build tools $buildToolsRevision missing. Downloading..."

def code = androidCommand.update "build-tools-$buildToolsRevision"
def code = androidCommand.update "build-tools-$buildToolsRevisionName"
if (code != 0) {
throw new StopExecutionException("Build tools download failed with code $code.")
}
Expand Down