summaryrefslogtreecommitdiff
path: root/prebuilts/gradle/Camera2Raw
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2015-08-14 16:16:39 -0700
committerTrevor Johns <trevorjohns@google.com>2015-08-14 16:16:39 -0700
commit0d86cdf09c798d97f14738b66b40a64617ed80cd (patch)
tree509ec7c5d93bde375abddd09ccf12766f2ba6729 /prebuilts/gradle/Camera2Raw
parent5d58bc48020c79cdfad3697cc093a462defcf524 (diff)
downloadbuild-0d86cdf09c798d97f14738b66b40a64617ed80cd.tar.gz
Update sample prebuilts to use latest deps
Pulling in dependency changes from //developers/build commit 5d58bc4802 Change-Id: I8b8bb7d7c349480e78f2b4ad5c1520a891735974
Diffstat (limited to 'prebuilts/gradle/Camera2Raw')
-rw-r--r--prebuilts/gradle/Camera2Raw/Application/build.gradle10
-rw-r--r--prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v11/template-styles.xml2
-rw-r--r--prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v21/base-template-styles.xml2
-rw-r--r--prebuilts/gradle/Camera2Raw/Application/src/main/res/values/template-styles.xml2
-rw-r--r--prebuilts/gradle/Camera2Raw/README.md2
5 files changed, 9 insertions, 9 deletions
diff --git a/prebuilts/gradle/Camera2Raw/Application/build.gradle b/prebuilts/gradle/Camera2Raw/Application/build.gradle
index 016cf60c..c0ed8ea6 100644
--- a/prebuilts/gradle/Camera2Raw/Application/build.gradle
+++ b/prebuilts/gradle/Camera2Raw/Application/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.0'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
@@ -16,9 +16,9 @@ repositories {
}
dependencies {
- compile "com.android.support:support-v4:21.0.2"
- compile "com.android.support:support-v13:21.0.2"
- compile "com.android.support:cardview-v7:21.0.2"
+ compile "com.android.support:support-v4:23.0.0"
+ compile "com.android.support:support-v13:23.0.0"
+ compile "com.android.support:cardview-v7:23.0.0"
}
// The sample build uses multiple directories to
@@ -31,7 +31,7 @@ List<String> dirs = [
android {
compileSdkVersion 21
- buildToolsVersion "22.0.1"
+ buildToolsVersion "23.0.0"
defaultConfig {
minSdkVersion 21
diff --git a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v11/template-styles.xml
index 8c1ea66f..f261bb5c 100644
--- a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v11/template-styles.xml
+++ b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v11/template-styles.xml
@@ -17,6 +17,6 @@
<resources>
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Holo.Light" />
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
</resources>
diff --git a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v21/base-template-styles.xml
index c778e4f9..d838f982 100644
--- a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v21/base-template-styles.xml
+++ b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values-v21/base-template-styles.xml
@@ -18,7 +18,7 @@
<resources>
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Material.Light">
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light">
</style>
</resources>
diff --git a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values/template-styles.xml
index 6e7d593d..74086d29 100644
--- a/prebuilts/gradle/Camera2Raw/Application/src/main/res/values/template-styles.xml
+++ b/prebuilts/gradle/Camera2Raw/Application/src/main/res/values/template-styles.xml
@@ -18,7 +18,7 @@
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Light" />
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
<style name="Theme.Sample" parent="Theme.Base" />
diff --git a/prebuilts/gradle/Camera2Raw/README.md b/prebuilts/gradle/Camera2Raw/README.md
index a19a182c..8dd05f7a 100644
--- a/prebuilts/gradle/Camera2Raw/README.md
+++ b/prebuilts/gradle/Camera2Raw/README.md
@@ -27,7 +27,7 @@ Pre-requisites
--------------
- Android SDK v21
-- Android Build Tools v22.0.1
+- Android Build Tools v23.0.0
- Android Support Repository
Screenshots