diff options
| author | Xavier Ducrohet <xav@android.com> | 2014-01-07 13:05:10 -0600 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2014-01-07 13:05:10 -0600 |
| commit | f5bf1f4d61b0fb7b8cb69721994b217922df312c (patch) | |
| tree | 8e7b9fc75a12769ed1d0ae7c7a45f78e8d3d8f53 /build.gradle | |
| parent | 366dafd52b824e6f06120f03ac559fe408a155b1 (diff) | |
| parent | f6988b6b45feba1597dbfb620763ecc665fc3d1c (diff) | |
| download | android_frameworks_support-f5bf1f4d61b0fb7b8cb69721994b217922df312c.tar.gz android_frameworks_support-f5bf1f4d61b0fb7b8cb69721994b217922df312c.tar.bz2 android_frameworks_support-f5bf1f4d61b0fb7b8cb69721994b217922df312c.zip | |
resolved conflicts for merge of f6988b6b to master
Change-Id: I33be7c8c238405329caad373ceb144ba53ffca5e
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 88ae4ca0d5..d84f58dfd9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,16 @@ buildscript { repositories { maven { url '../../prebuilts/gradle-plugin' } + mavenCentral() maven { url '../../prebuilts/tools/common/m2/repository' } maven { url '../../prebuilts/tools/common/m2/internal' } } dependencies { - classpath 'com.android.tools.build:gradle:0.5.7' + classpath 'com.android.tools.build:gradle:0.7.0' } } -ext.version = '18.0.1' +ext.supportVersion = '20.0.0' // ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/ ext.androidHostOut = file("$rootDir/../../out") @@ -17,11 +18,11 @@ ext.androidHostOut = file("$rootDir/../../out") // rootProject.buildDir is specific to this gradle build. buildDir = new File(ext.androidHostOut, "host/gradle/frameworks/support/build") -ext.androidRepoOut = new File(ext.androidHostOut, "host/support_repo/") +ext.supportRepoOut = new File(ext.androidHostOut, "host/support_repo/") task release(type: Copy) { from "$rootDir/../../prebuilts/maven_repo/android" - into project.ext.androidRepoOut + into project.ext.supportRepoOut } subprojects { @@ -30,14 +31,14 @@ subprojects { apply plugin: 'maven' - version = rootProject.ext.version + version = rootProject.ext.supportVersion group = 'com.android.support' task release(type: Upload) { configuration = configurations.archives repositories { mavenDeployer { - repository(url: uri("$rootProject.ext.androidRepoOut")) + repository(url: uri("$rootProject.ext.supportRepoOut")) } } } @@ -47,3 +48,4 @@ subprojects { FileCollection getAndroidPrebuilt(String apiLevel) { files("$rootDir/../../prebuilts/sdk/$apiLevel/android.jar") } + |