aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorBen Weiss <benweiss@google.com>2019-01-10 10:24:05 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-10 10:24:05 -0800
commit7fc5256ee9674237b49c6409a459cd23936f9441 (patch)
tree870908dfef49a032f85f2c11ce3cb5a2384cb0d3 /ui
parent3bb1a3a6c38487fce726931c54de4db965951641 (diff)
parent2424b022b0e4e1b6e0d3b64ee6422b0b780c2cdb (diff)
downloadandroid-7fc5256ee9674237b49c6409a459cd23936f9441.tar.gz
Fix compilation of MultiWindowPlayground am: e18084863b
am: 2424b022b0 Change-Id: I5d7c5e82fc016f0d6230036b8c540b6d7e381ff4
Diffstat (limited to 'ui')
-rw-r--r--ui/window/MultiWindowPlayground/Application/build.gradle13
-rw-r--r--ui/window/MultiWindowPlayground/README.md6
-rw-r--r--ui/window/MultiWindowPlayground/gradle/wrapper/gradle-wrapper.properties2
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