commit 5057daacdc2221b44922822e92dc8130f98edf6e
author Raphael Moll <raphael@google.com> Tue Oct 29 17:01:14 2013 -0700
committer Raphaël Moll <raphael@google.com> Tue Nov 26 18:58:50 2013 +0000
tree 752c1d8549361c8fdea48ece41c2c773a82a1ca4
parent 3f0314b41fef7b680548cce0fab4e14565a5b2e3

Update maven support lib version for KLP.

H/t to Siva for most of this.

Bug: 11422672

Change-Id: Ic239fc9e6123d7420274be2b94abb6231f9eb5a6

build.gradle

diff --git a/build.gradle b/build.gradle
index 88ae4ca..fc7af2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@
     }
 }
 
-ext.version = '18.0.1'
+ext.version = '19.0.0'
 
 // ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/
 ext.androidHostOut = file("$rootDir/../../out")

v4/build.gradle

diff --git a/v4/build.gradle b/v4/build.gradle
index c4b5bae..1751bb1 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -5,6 +5,7 @@
 sourceSets {
     main.java.srcDir 'java'
     eclair.java.srcDir 'eclair'
+    eclairmr1.java.srcDir 'eclair-mr1'
     froyo.java.srcDir 'froyo'
     gingerbread.java.srcDir 'gingerbread'
     honeycomb.java.srcDir 'honeycomb'
@@ -19,6 +20,7 @@
 
 dependencies {
     eclairCompile getAndroidPrebuilt('5')
+    eclairmr1Compile getAndroidPrebuilt('7')
     froyoCompile getAndroidPrebuilt('8')
     gingerbreadCompile getAndroidPrebuilt('9')
     honeycombCompile getAndroidPrebuilt('11')
@@ -28,10 +30,11 @@
     jellybeanCompile getAndroidPrebuilt('16')
     jellybeanmr1Compile getAndroidPrebuilt('17')
     jellybeanmr2Compile getAndroidPrebuilt('18')
-    kitkatCompile getAndroidPrebuilt('current')
+    kitkatCompile getAndroidPrebuilt('19')
 
     compile getAndroidPrebuilt('4')
     compile sourceSets.eclair.output
+    compile sourceSets.eclairmr1.output
     compile sourceSets.froyo.output
     compile sourceSets.gingerbread.output
     compile sourceSets.honeycomb.output
@@ -47,6 +50,7 @@
 
 jar {
     from sourceSets.eclair.output
+    from sourceSets.eclairmr1.output
     from sourceSets.froyo.output
     from sourceSets.gingerbread.output
     from sourceSets.honeycomb.output
@@ -97,6 +101,7 @@
 javadoc {
     source    sourceSets.main.allJava
     source    sourceSets.eclair.allJava
+    source    sourceSets.eclairmr1.allJava
     source    sourceSets.froyo.allJava
     source    sourceSets.gingerbread.allJava
     source    sourceSets.honeycomb.allJava
@@ -114,6 +119,7 @@
     classifier = 'sources'
     from sourceSets.main.allSource
     from sourceSets.eclair.allSource
+    from sourceSets.eclairmr1.allSource
     from sourceSets.froyo.allSource
     from sourceSets.gingerbread.allSource
     from sourceSets.honeycomb.allSource

v7/gridlayout/build.gradle

diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index 4fc6b12..ad387b4 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -2,8 +2,13 @@
 
 archivesBaseName = 'gridlayout-v7'
 
+dependencies {
+    compile project(':v4')
+}
+
+
 android {
-    compileSdkVersion "unstubbed"
+    compileSdkVersion "current"
     buildToolsVersion "17"
 
     sourceSets {
@@ -19,4 +24,4 @@
         // This is a *reset* so it replaces the default paths
         instrumentTest.setRoot('tests')
     }
-}
\ No newline at end of file
+}

v7/mediarouter/build.gradle

diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index 5355e8e..5bc404e 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -31,7 +31,7 @@
     jellybeanmr1Compile getAndroidPrebuilt('17')
     jellybeanmr1Compile sourceSets.jellybean.output
 
-    jellybeanmr2Compile getAndroidPrebuilt('current')
+    jellybeanmr2Compile getAndroidPrebuilt('18')
     jellybeanmr2Compile sourceSets.jellybean.output
     jellybeanmr2Compile sourceSets.jellybeanmr1.output
 
@@ -59,4 +59,4 @@
 
 android.libraryVariants.all { variant ->
     variant.javaCompile.dependsOn jar
-}
\ No newline at end of file
+}