Another build.gradle file cleanup.
- Move setting meta-data values to AndroidSupportPlugin
- Move setting CompileSdkVersion to AndroidSupportPlugin
- Clean up places that set AndroidManifest.xml redudundantly
- Clean up setting target java version for support-annotations.
Bug: 33845666
Test: ./gradlew assemble continues to work
Change-Id: Ic02778ac62e0fc40a77b8aed5a14e1b2956a88f1
diff --git a/annotations/build.gradle b/annotations/build.gradle
index 4907e2a..6071820 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -1,14 +1,14 @@
apply plugin: 'java'
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
archivesBaseName = 'support-annotations'
sourceSets {
main.java.srcDir 'src'
}
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+compileJava {
+ sourceCompatibility = JavaVersion.VERSION_1_7
+ targetCompatibility = JavaVersion.VERSION_1_7
+}
jar {
from sourceSets.main.output