diff options
| author | Ben Weiss <benweiss@google.com> | 2019-01-10 13:54:22 +0000 |
|---|---|---|
| committer | Ben Weiss <benweiss@google.com> | 2019-01-10 16:37:41 +0000 |
| commit | e18084863b4082cac0d7b71f3d711d786708e6c0 (patch) | |
| tree | ed3497f9e001a3775bb292217978b42a1fa99a44 /ui/window | |
| parent | 5d30bac601400ec4370b5f7e6750b07321dde5e6 (diff) | |
| download | android-e18084863b4082cac0d7b71f3d711d786708e6c0.tar.gz | |
Fix compilation of MultiWindowPlayground
Bug: 122642216
Bug: 122645564
Test: compileSamples.sh
Change-Id: I63c16c396c9569d2f6dabaa52cff619c1ea33d09
Diffstat (limited to 'ui/window')
3 files changed, 11 insertions, 10 deletions
diff --git a/ui/window/MultiWindowPlayground/Application/build.gradle b/ui/window/MultiWindowPlayground/Application/build.gradle index f197d17e..469a8056 100644 --- a/ui/window/MultiWindowPlayground/Application/build.gradle +++ b/ui/window/MultiWindowPlayground/Application/build.gradle @@ -16,16 +16,18 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.1' } } allprojects { repositories { + google() jcenter() } } @@ -33,13 +35,12 @@ allprojects { apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion '23.0.3' + compileSdkVersion 27 defaultConfig { applicationId "com.android.multiwindowplayground" minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -60,7 +61,7 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:24.0.0-beta1' - androidTestCompile 'com.android.support:support-annotations:24.0.0-beta1' + compile 'com.android.support:appcompat-v7:27.0.0' + androidTestCompile 'com.android.support:support-annotations:27.0.0' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' } diff --git a/ui/window/MultiWindowPlayground/README.md b/ui/window/MultiWindowPlayground/README.md index b58b2857..ca768282 100644 --- a/ui/window/MultiWindowPlayground/README.md +++ b/ui/window/MultiWindowPlayground/README.md @@ -48,14 +48,14 @@ Alternatively, the preferred and minimum sizes can be set in a new Pre-requisites -------------- -- Android SDK 24 -- Android Build Tools v26.0.1 +- Android SDK 27 +- Android Build Tools v27.0.3 - Android Support Repository Screenshots ------------- -<img src="screenshots/main.png" height="400" alt="Screenshot"/> +<img src="screenshots/main.png" height="400" alt="Screenshot"/> Getting Started --------------- diff --git a/ui/window/MultiWindowPlayground/gradle/wrapper/gradle-wrapper.properties b/ui/window/MultiWindowPlayground/gradle/wrapper/gradle-wrapper.properties index fc5d4423..84a13f5c 100644 --- a/ui/window/MultiWindowPlayground/gradle/wrapper/gradle-wrapper.properties +++ b/ui/window/MultiWindowPlayground/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip |