aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2017-10-10 14:16:54 -0700
committerTrevor Johns <trevorjohns@google.com>2017-10-10 16:12:29 -0700
commit6defc79368244fe1643aec42196424ceed779d07 (patch)
tree6834f7fc22775b50db8b0d8e2fb1c93bd3c34880 /ui
parent4686d90df6d378ae382726c9ca43ff06a1496604 (diff)
downloadandroid-6defc79368244fe1643aec42196424ceed779d07.tar.gz
Fix dependency versions
Fixing dependency versions for a few samples that are preventing the 2017-10 samples release from building. Bug: 67644397 Test: Passes refresh/emit tasks in compileSamples.sh Change-Id: Ic70544d75159e9d1cff487c6b653561a7d944ee9
Diffstat (limited to 'ui')
-rw-r--r--ui/window/AdvancedImmersiveMode/Application/build.gradle21
-rw-r--r--ui/window/MultiWindowPlayground/.google/packaging.yaml2
2 files changed, 14 insertions, 9 deletions
diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle
index 7d6055f3..08444ffe 100644
--- a/ui/window/AdvancedImmersiveMode/Application/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.3'
}
}
@@ -13,13 +13,16 @@ apply plugin: 'com.android.application'
repositories {
jcenter()
+ maven {
+ url 'https://maven.google.com'
+ }
}
dependencies {
- compile "com.android.support:support-v4:25.0.1"
- compile "com.android.support:support-v13:25.0.1"
- compile "com.android.support:cardview-v7:25.0.1"
- compile "com.android.support:appcompat-v7:25.0.1"
+ compile "com.android.support:support-v4:26.1.0"
+ compile "com.android.support:support-v13:26.1.0"
+ compile "com.android.support:cardview-v7:26.1.0"
+ compile "com.android.support:appcompat-v7:26.1.0"
}
// The sample build uses multiple directories to
@@ -31,12 +34,14 @@ List<String> dirs = [
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 24
- buildToolsVersion "24.0.2"
+
+ compileSdkVersion 26
+
+ buildToolsVersion "26.0.1"
defaultConfig {
minSdkVersion 19
- targetSdkVersion 24
+ targetSdkVersion 26
}
compileOptions {
diff --git a/ui/window/MultiWindowPlayground/.google/packaging.yaml b/ui/window/MultiWindowPlayground/.google/packaging.yaml
index a2ac75a8..00f3ac2f 100644
--- a/ui/window/MultiWindowPlayground/.google/packaging.yaml
+++ b/ui/window/MultiWindowPlayground/.google/packaging.yaml
@@ -6,7 +6,7 @@
---
status: PUBLISHED
technologies: [Android]
-categories: [Android N Preview]
+categories: [UI]
languages: [Java]
solutions: [Mobile]
github: android-MultiWindowPlayground