Merge "Bump minSdk to 9 everywhere where it was < 9"
diff --git a/compat/AndroidManifest.xml b/compat/AndroidManifest.xml
index c6cdf4c..b2bd5bb 100644
--- a/compat/AndroidManifest.xml
+++ b/compat/AndroidManifest.xml
@@ -16,6 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="android.support.compat">
- <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="android.support.compat"/>
+ <uses-sdk android:minSdkVersion="9" tools:overrideLibrary="android.support.compat"/>
<application />
</manifest>
diff --git a/compat/build.gradle b/compat/build.gradle
index b41afc7..ba84b8e 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -21,10 +21,10 @@
setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.compat.dependencies)
android {
- compileSdkVersion 4
+ compileSdkVersion 9
defaultConfig {
- minSdkVersion 4
+ minSdkVersion 9
// TODO: get target from branch
//targetSdkVersion 19
diff --git a/compat/tests/AndroidManifest.xml b/compat/tests/AndroidManifest.xml
index 60d54cf..e0acc6c 100644
--- a/compat/tests/AndroidManifest.xml
+++ b/compat/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.compat.test">
<uses-sdk
- android:minSdkVersion="4"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling"/>
diff --git a/core-combined/AndroidManifest.xml b/core-combined/AndroidManifest.xml
index 01eaccf..d76c581 100644
--- a/core-combined/AndroidManifest.xml
+++ b/core-combined/AndroidManifest.xml
@@ -16,6 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="android.support.v4">
- <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="android.support.v4"/>
+ <uses-sdk android:minSdkVersion="9" tools:overrideLibrary="android.support.v4"/>
<application />
</manifest>
diff --git a/core-combined/build.gradle b/core-combined/build.gradle
index 72cbe63..0e1ac7d 100644
--- a/core-combined/build.gradle
+++ b/core-combined/build.gradle
@@ -10,7 +10,7 @@
compileSdkVersion project.ext.currentSdk
defaultConfig {
- minSdkVersion 4
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
diff --git a/design/AndroidManifest.xml b/design/AndroidManifest.xml
index 963f89b..82f19db 100644
--- a/design/AndroidManifest.xml
+++ b/design/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.design">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application />
</manifest>
diff --git a/design/build.gradle b/design/build.gradle
index 7148e50..a018bb1 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -23,7 +23,7 @@
compileSdkVersion project.ext.currentSdk
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
diff --git a/design/tests/AndroidManifest.xml b/design/tests/AndroidManifest.xml
index 2fb8d92..ba19280 100755
--- a/design/tests/AndroidManifest.xml
+++ b/design/tests/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="android.support.design.test">
<uses-sdk
- android:minSdkVersion="7"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling"/>
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index f7a5b97..845686d 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -17,7 +17,7 @@
compileSdkVersion 23
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
diff --git a/graphics/drawable/static/tests/AndroidManifest.xml b/graphics/drawable/static/tests/AndroidManifest.xml
index 27f3fbd..3a6942d 100644
--- a/graphics/drawable/static/tests/AndroidManifest.xml
+++ b/graphics/drawable/static/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.graphics.drawable.test">
<uses-sdk
- android:minSdkVersion="8"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling" />
diff --git a/percent/Android.mk b/percent/Android.mk
index 59556c0..16afe7f 100644
--- a/percent/Android.mk
+++ b/percent/Android.mk
@@ -24,7 +24,7 @@
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-percent
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 9
LOCAL_SDK_RES_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/percent/AndroidManifest.xml b/percent/AndroidManifest.xml
index 8668424..e979013 100644
--- a/percent/AndroidManifest.xml
+++ b/percent/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.percent">
- <uses-sdk android:minSdkVersion="8"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application />
</manifest>
diff --git a/percent/build.gradle b/percent/build.gradle
index 0603ad9..72304a1 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -18,7 +18,7 @@
compileSdkVersion project.ext.currentSdk
defaultConfig {
- minSdkVersion 8
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
diff --git a/percent/tests/AndroidManifest.xml b/percent/tests/AndroidManifest.xml
index 993e69b..ba3aa19 100644
--- a/percent/tests/AndroidManifest.xml
+++ b/percent/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.percent.test">
<uses-sdk
- android:minSdkVersion="8"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling" />
diff --git a/v4/AndroidManifest.xml b/v4/AndroidManifest.xml
index 735cd45..bd21018 100644
--- a/v4/AndroidManifest.xml
+++ b/v4/AndroidManifest.xml
@@ -16,6 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="android.support.core">
- <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="android.support.core"/>
+ <uses-sdk android:minSdkVersion="9" tools:overrideLibrary="android.support.core"/>
<application />
</manifest>
diff --git a/v4/build.gradle b/v4/build.gradle
index 24d92c8..9415e63 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -22,10 +22,10 @@
setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.core.dependencies)
android {
- compileSdkVersion 4
+ compileSdkVersion 9
defaultConfig {
- minSdkVersion 4
+ minSdkVersion 9
// TODO: get target from branch
//targetSdkVersion 19
diff --git a/v4/tests/AndroidManifest.xml b/v4/tests/AndroidManifest.xml
index aabcf07..a050840 100644
--- a/v4/tests/AndroidManifest.xml
+++ b/v4/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.core.test">
<uses-sdk
- android:minSdkVersion="4"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling"/>
diff --git a/v7/appcompat/AndroidManifest.xml b/v7/appcompat/AndroidManifest.xml
index 0e0aba8..99b77ee 100644
--- a/v7/appcompat/AndroidManifest.xml
+++ b/v7/appcompat/AndroidManifest.xml
@@ -16,7 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="android.support.v7.appcompat">
- <uses-sdk android:minSdkVersion="7"
+ <uses-sdk android:minSdkVersion="9"
tools:overrideLibrary="android.support.graphics.drawable.animated"/>
<application/>
</manifest>
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index faa8439..9edd016 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -23,7 +23,7 @@
compileSdkVersion project.ext.currentSdk
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
diff --git a/v7/appcompat/tests/AndroidManifest.xml b/v7/appcompat/tests/AndroidManifest.xml
index 539030d..ee479cf 100644
--- a/v7/appcompat/tests/AndroidManifest.xml
+++ b/v7/appcompat/tests/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="android.support.v7.appcompat.test">
<uses-sdk
- android:minSdkVersion="7"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling"/>
diff --git a/v7/cardview/AndroidManifest.xml b/v7/cardview/AndroidManifest.xml
index 3ef02dc..c35e369 100644
--- a/v7/cardview/AndroidManifest.xml
+++ b/v7/cardview/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.cardview">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application />
</manifest>
diff --git a/v7/cardview/build.gradle b/v7/cardview/build.gradle
index 65ca583..5162e27 100644
--- a/v7/cardview/build.gradle
+++ b/v7/cardview/build.gradle
@@ -11,7 +11,7 @@
compileSdkVersion project.ext.currentSdk
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
// TODO: get target from branch
//targetSdkVersion 19
}
diff --git a/v7/gridlayout/Android.mk b/v7/gridlayout/Android.mk
index f9bd0a1..da68275 100644
--- a/v7/gridlayout/Android.mk
+++ b/v7/gridlayout/Android.mk
@@ -27,7 +27,7 @@
LOCAL_MODULE := android-support-v7-gridlayout
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SDK_VERSION := 7
+LOCAL_SDK_VERSION := 9
LOCAL_SHARED_ANDROID_LIBRARIES := android-support-v4
LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
diff --git a/v7/gridlayout/AndroidManifest.xml b/v7/gridlayout/AndroidManifest.xml
index 97f7be8..d2cc627 100644
--- a/v7/gridlayout/AndroidManifest.xml
+++ b/v7/gridlayout/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.gridlayout">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application />
</manifest>
diff --git a/v7/gridlayout/tests/AndroidManifest.xml b/v7/gridlayout/tests/AndroidManifest.xml
index fc502a5..4c4b0ab 100644
--- a/v7/gridlayout/tests/AndroidManifest.xml
+++ b/v7/gridlayout/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.v7.gridlayout.test">
<uses-sdk
- android:minSdkVersion="7"
+ android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
android.support.test.espresso, android.support.test.espresso.idling" />
diff --git a/v7/mediarouter/Android.mk b/v7/mediarouter/Android.mk
index c0c4085..8d80084 100644
--- a/v7/mediarouter/Android.mk
+++ b/v7/mediarouter/Android.mk
@@ -86,7 +86,7 @@
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-v7-mediarouter
-LOCAL_SDK_VERSION := 7
+LOCAL_SDK_VERSION := 9
LOCAL_SDK_RES_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v7-mediarouter-api24
diff --git a/v7/mediarouter/AndroidManifest.xml b/v7/mediarouter/AndroidManifest.xml
index e611947..59d9f99 100644
--- a/v7/mediarouter/AndroidManifest.xml
+++ b/v7/mediarouter/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.mediarouter">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application />
</manifest>
diff --git a/v7/palette/Android.mk b/v7/palette/Android.mk
index 814ef24..bf57ce3 100644
--- a/v7/palette/Android.mk
+++ b/v7/palette/Android.mk
@@ -25,7 +25,7 @@
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-v7-palette
-LOCAL_SDK_VERSION := 7
+LOCAL_SDK_VERSION := 9
LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
diff --git a/v7/palette/build.gradle b/v7/palette/build.gradle
index 65e298d..09fd7fd 100644
--- a/v7/palette/build.gradle
+++ b/v7/palette/build.gradle
@@ -12,10 +12,10 @@
}
android {
- compileSdkVersion 7
+ compileSdkVersion 9
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
diff --git a/v7/palette/src/androidTest/AndroidManifest.xml b/v7/palette/src/androidTest/AndroidManifest.xml
index f9b8b1e..c4fd08f 100644
--- a/v7/palette/src/androidTest/AndroidManifest.xml
+++ b/v7/palette/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.support.v7.palette.test">
- <uses-sdk android:minSdkVersion="7"
+ <uses-sdk android:minSdkVersion="9"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule"/>
<application>
diff --git a/v7/palette/src/main/AndroidManifest.xml b/v7/palette/src/main/AndroidManifest.xml
index 20e14c2..c44818a 100644
--- a/v7/palette/src/main/AndroidManifest.xml
+++ b/v7/palette/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.palette">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
<application>
</application>
</manifest>
diff --git a/v7/preference/Android.mk b/v7/preference/Android.mk
index 43fc74c..42527e1 100644
--- a/v7/preference/Android.mk
+++ b/v7/preference/Android.mk
@@ -43,7 +43,7 @@
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-v7-preference
-LOCAL_SDK_VERSION := 7
+LOCAL_SDK_VERSION := 9
LOCAL_SDK_RES_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_STATIC_ANDROID_LIBRARIES := \
diff --git a/v7/preference/AndroidManifest.xml b/v7/preference/AndroidManifest.xml
index e5aa094..da9c80e 100644
--- a/v7/preference/AndroidManifest.xml
+++ b/v7/preference/AndroidManifest.xml
@@ -3,6 +3,6 @@
package="android.support.v7.preference"
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="7" />
+ <uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
diff --git a/v7/recyclerview/Android.mk b/v7/recyclerview/Android.mk
index 021296e..328c761 100644
--- a/v7/recyclerview/Android.mk
+++ b/v7/recyclerview/Android.mk
@@ -26,7 +26,7 @@
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-v7-recyclerview
-LOCAL_SDK_VERSION := 7
+LOCAL_SDK_VERSION := 9
LOCAL_SDK_RES_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/v7/recyclerview/AndroidManifest.xml b/v7/recyclerview/AndroidManifest.xml
index 421395f..d1c1489 100644
--- a/v7/recyclerview/AndroidManifest.xml
+++ b/v7/recyclerview/AndroidManifest.xml
@@ -15,5 +15,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.recyclerview">
- <uses-sdk android:minSdkVersion="7"/>
+ <uses-sdk android:minSdkVersion="9"/>
</manifest>
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index 386694d..ac29032 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -21,7 +21,7 @@
compileSdkVersion 23
defaultConfig {
- minSdkVersion 7
+ minSdkVersion 9
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
diff --git a/v7/recyclerview/tests/AndroidManifest.xml b/v7/recyclerview/tests/AndroidManifest.xml
index 0661526..1c8684d 100644
--- a/v7/recyclerview/tests/AndroidManifest.xml
+++ b/v7/recyclerview/tests/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="android.support.v7.recyclerview.test">
- <uses-sdk android:minSdkVersion="7"
+ <uses-sdk android:minSdkVersion="9"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test,
android.app, android.support.test.rule, android.support.test.espresso,