summaryrefslogtreecommitdiff
path: root/prebuilts/gradle/BasicMediaDecoder
diff options
context:
space:
mode:
authorAlexander Lucas <alexlucas@google.com>2014-04-10 14:47:11 -0700
committerAlexander Lucas <alexlucas@google.com>2014-04-10 14:52:40 -0700
commit6686a2f31fc4154188a906e9ed580b6a38eb3f04 (patch)
tree8bb6b9e3a70fc631258e937f69951e48d339d4ea /prebuilts/gradle/BasicMediaDecoder
parent2f357e1165f328d2064709b9d602ebbb45106a86 (diff)
downloadbuild-6686a2f31fc4154188a906e9ed580b6a38eb3f04.tar.gz
Updated sample prebuilts for sdk manager push
Change-Id: I35bdecd7712aee917eeecd29564a50897d8fef1d
Diffstat (limited to 'prebuilts/gradle/BasicMediaDecoder')
-rw-r--r--prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle14
-rw-r--r--prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml22
-rw-r--r--prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml2
-rw-r--r--prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties2
4 files changed, 34 insertions, 6 deletions
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
index 2a7b163b..dc4040d6 100644
--- a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
@@ -7,15 +7,19 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.8.+'
+ classpath 'com.android.tools.build:gradle:0.9.+'
}
}
apply plugin: 'android'
+
dependencies {
+
// Add the support lib that is appropriate for SDK 17
- compile "com.android.support:support-v13:19.0.+"
+ compile "com.android.support:support-v13:19.1.+"
+
+
}
// The sample build uses multiple directories to
@@ -28,6 +32,7 @@ List<String> dirs = [
android {
compileSdkVersion 19
+
buildToolsVersion "19.0.1"
sourceSets {
@@ -37,8 +42,9 @@ android {
res.srcDirs "src/${dir}/res"
}
}
- instrumentTest.setRoot('tests')
- instrumentTest.java.srcDirs = ['tests/src']
+ androidTest.setRoot('tests')
+ androidTest.java.srcDirs = ['tests/src']
+
}
}
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml
new file mode 100644
index 00000000..8c1ea66f
--- /dev/null
+++ b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+ Copyright 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources>
+
+ <!-- Activity themes -->
+ <style name="Theme.Base" parent="android:Theme.Holo.Light" />
+
+</resources>
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml
index 404623e3..6e7d593d 100644
--- a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml
+++ b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml
@@ -18,7 +18,7 @@
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Holo.Light" />
+ <style name="Theme.Base" parent="android:Theme.Light" />
<style name="Theme.Sample" parent="Theme.Base" />
diff --git a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
index 861eddc3..56f685a4 100644
--- a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip