Update support projects to be reusable.
This makes the project names (and their inter-dependencies)
to not be tied to their location under frameworks/support,
allowing other project to include them as part of a different
multi-project setup.
Change-Id: I897e24fec98785b03a79465633d470f832ff543e
Conflicts:
settings.gradle
diff --git a/annotations/build.gradle b/annotations/build.gradle
index c1f94fd..065bfb6 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -14,7 +14,7 @@
repositories {
mavenDeployer {
- repository(url: uri(project.parent.ext.androidRepoOut)) {
+ repository(url: uri(rootProject.ext.supportRepoOut)) {
}
pom.project {
diff --git a/build.gradle b/build.gradle
index 164daa7..f249ba9 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 = '19.0.1'
+ext.supportVersion = '19.0.1'
// ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/
ext.androidHostOut = file("$rootDir/../../out")
@@ -17,11 +18,11 @@
// 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 @@
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 @@
FileCollection getAndroidPrebuilt(String apiLevel) {
files("$rootDir/../../prebuilts/sdk/$apiLevel/android.jar")
}
+
diff --git a/settings.gradle b/settings.gradle
index f92a203..83498d3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,17 @@
-include 'annotations'
-include 'v4'
-include 'v13'
-include 'v7:gridlayout'
-include 'v7:appcompat'
-include 'v7:mediarouter'
+include ':support-v4'
+project(':support-v4').projectDir = new File(rootDir, 'v4')
+include ':support-appcompat-v7'
+project(':support-appcompat-v7').projectDir = new File(rootDir, 'v7/appcompat')
+
+include ':support-gridlayout-v7'
+project(':support-gridlayout-v7').projectDir = new File(rootDir, 'v7/gridlayout')
+
+include ':support-mediarouter-v7'
+project(':support-mediarouter-v7').projectDir = new File(rootDir, 'v7/mediarouter')
+
+include ':support-v13'
+project(':support-v13').projectDir = new File(rootDir, 'v13')
+
+include ':support-annotations'
+project(':support-annotations').projectDir = new File(rootDir, 'annotations')
diff --git a/v13/build.gradle b/v13/build.gradle
index 89359c7..709144c 100644
--- a/v13/build.gradle
+++ b/v13/build.gradle
@@ -2,6 +2,11 @@
archivesBaseName = 'support-v13'
+FileCollection getAndroidPrebuilt(String apiLevel) {
+ files("$rootDir/../../prebuilts/sdk/$apiLevel/android.jar")
+}
+
+
sourceSets {
main.java.srcDir 'java'
ics.java.srcDir 'ics'
@@ -18,7 +23,7 @@
// order is important as we need the API 13 before the API 4 so that it uses the latest one.
compile getAndroidPrebuilt('13')
- compile project(':v4')
+ compile project(':support-v4')
compile sourceSets.ics.output
compile sourceSets.icsmr1.output
compile sourceSets.k.output
@@ -34,7 +39,7 @@
repositories {
mavenDeployer {
- repository(url: uri(project.parent.ext.androidRepoOut)) {
+ repository(url: uri(rootProject.ext.supportRepoOut)) {
}
pom.project {
diff --git a/v4/build.gradle b/v4/build.gradle
index 1751bb1..c09ca16 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -2,6 +2,11 @@
archivesBaseName = 'support-v4'
+FileCollection getAndroidPrebuilt(String apiLevel) {
+ files("$rootDir/../../prebuilts/sdk/$apiLevel/android.jar")
+}
+
+
sourceSets {
main.java.srcDir 'java'
eclair.java.srcDir 'eclair'
@@ -66,7 +71,7 @@
uploadArchives {
repositories {
mavenDeployer {
- repository(url: uri(project.parent.ext.androidRepoOut)) {
+ repository(url: uri(rootProject.ext.supportRepoOut)) {
}
pom.project {
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index 5616d0d..d2b7e8d 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -3,7 +3,7 @@
archivesBaseName = 'appcompat-v7'
dependencies {
- compile project(':v4')
+ compile project(':support-v4')
}
android {
diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index ad387b4..bfc74aa 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -3,7 +3,7 @@
archivesBaseName = 'gridlayout-v7'
dependencies {
- compile project(':v4')
+ compile project(':support-v4')
}
diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index 5bc404e..b3888ed 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -2,8 +2,13 @@
archivesBaseName = 'mediarouter-v7'
+FileCollection getAndroidPrebuilt(String apiLevel) {
+ files("$rootDir/../../prebuilts/sdk/$apiLevel/android.jar")
+}
+
+
dependencies {
- compile project(':v7:appcompat')
+ compile project(':support-appcompat-v7')
}
// some of the source requires compiling against a newer API.