diff options
author | Trevor Johns <trevorjohns@google.com> | 2017-10-10 14:16:54 -0700 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2017-10-10 16:12:29 -0700 |
commit | 6defc79368244fe1643aec42196424ceed779d07 (patch) | |
tree | 6834f7fc22775b50db8b0d8e2fb1c93bd3c34880 | |
parent | 4686d90df6d378ae382726c9ca43ff06a1496604 (diff) | |
download | android-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
9 files changed, 37 insertions, 29 deletions
diff --git a/background/alarms/RepeatingAlarm/Application/build.gradle b/background/alarms/RepeatingAlarm/Application/build.gradle index cd78ff4c..194379f0 100644 --- a/background/alarms/RepeatingAlarm/Application/build.gradle +++ b/background/alarms/RepeatingAlarm/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:gridlayout-v7: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:gridlayout-v7: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 11 - targetSdkVersion 24 + targetSdkVersion 26 } compileOptions { diff --git a/content/documentsUi/ContentProviderPaging/common.gradle b/content/documentsUi/ContentProviderPaging/common.gradle index c1cfce09..e5c3bddd 100644 --- a/content/documentsUi/ContentProviderPaging/common.gradle +++ b/content/documentsUi/ContentProviderPaging/common.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 'android-O' - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { applicationId "com.example.android.contentproviderpaging" - minSdkVersion 'O' - targetSdkVersion 'O' + minSdkVersion 26 + targetSdkVersion 26 } buildTypes { diff --git a/content/documentsUi/ContentProviderPaging/kotlinApp/common.gradle b/content/documentsUi/ContentProviderPaging/kotlinApp/common.gradle index c1cfce09..e5c3bddd 100644 --- a/content/documentsUi/ContentProviderPaging/kotlinApp/common.gradle +++ b/content/documentsUi/ContentProviderPaging/kotlinApp/common.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 'android-O' - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { applicationId "com.example.android.contentproviderpaging" - minSdkVersion 'O' - targetSdkVersion 'O' + minSdkVersion 26 + targetSdkVersion 26 } buildTypes { diff --git a/content/documentsUi/ContentProviderPaging/template-params.xml b/content/documentsUi/ContentProviderPaging/template-params.xml index 20780c44..86ea6b75 100644 --- a/content/documentsUi/ContentProviderPaging/template-params.xml +++ b/content/documentsUi/ContentProviderPaging/template-params.xml @@ -19,8 +19,6 @@ <group>UI</group> <package>com.example.android.contentproviderpaging</package> - <minSdk>"android-O"</minSdk> - <strings> <intro> <![CDATA[ diff --git a/media/PictureInPicture/build.gradle b/media/PictureInPicture/build.gradle index e663e06f..4ce13fc0 100644 --- a/media/PictureInPicture/build.gradle +++ b/media/PictureInPicture/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta7' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/notification/NotificationChannels/template-params.xml b/notification/NotificationChannels/template-params.xml index 63f2467a..a2feb6c8 100644 --- a/notification/NotificationChannels/template-params.xml +++ b/notification/NotificationChannels/template-params.xml @@ -23,7 +23,6 @@ <!-- change minSdk if needed--> <minSdk>21</minSdk> - <compileSdkVersion>"android-O"</compileSdkVersion> <!-- Include additional dependencies here.--> <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency --> diff --git a/projects.txt b/projects.txt index 461e2425..6800fdf8 100644 --- a/projects.txt +++ b/projects.txt @@ -129,3 +129,4 @@ input/autofill/AutofillFramework views/EmojiCompat ui/fonts/DownloadableFonts wearable/wear/WearComplicationProvidersTestSuite +wearable/wear/WearMessagingApp
\ No newline at end of file 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 |