diff options
author | Jeremy Walker <jewalker@google.com> | 2019-01-29 14:02:53 -0800 |
---|---|---|
committer | Jeremy Walker <jewalker@google.com> | 2019-01-29 14:02:53 -0800 |
commit | ba36204b59c9f08ef432d9add8c869e7aadb61ca (patch) | |
tree | 8d63bee51fffd909c4102d4a2dee41c6ecf157a2 /wearable | |
parent | c87ea8c2cab546f64cb792bc0bf060fbb48a1eaa (diff) | |
download | android-ba36204b59c9f08ef432d9add8c869e7aadb61ca.tar.gz |
Updates sample to latest support libraries (non androidx).
Bug: 117822353
Test: Manually tested
Change-Id: I762a0c4a684451a4fc169493525a4812c2b367f2
Diffstat (limited to 'wearable')
4 files changed, 59 insertions, 6 deletions
diff --git a/wearable/wear/WearVerifyRemoteApp/.gitignore b/wearable/wear/WearVerifyRemoteApp/.gitignore new file mode 100644 index 00000000..b90e7562 --- /dev/null +++ b/wearable/wear/WearVerifyRemoteApp/.gitignore @@ -0,0 +1,33 @@ +# built application files +*.apk +*.ap_ + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ + +# Ignore gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ +proguard-project.txt + +# Eclipse files +.project +.classpath +.settings/ + +# Android Studio/IDEA +*.iml +.idea diff --git a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle b/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle index 94056696..78330994 100644 --- a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle +++ b/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle @@ -21,7 +21,7 @@ repositories { dependencies { - implementation 'com.android.support:wear:27.1.1' + implementation 'com.android.support:wear:28.0.0' implementation 'com.google.android.gms:play-services-wearable:15.0.1' @@ -54,7 +54,7 @@ android { minSdkVersion 23 - targetSdkVersion 26 + targetSdkVersion 28 } diff --git a/wearable/wear/WearVerifyRemoteApp/gradle.properties b/wearable/wear/WearVerifyRemoteApp/gradle.properties new file mode 100644 index 00000000..0bc4294e --- /dev/null +++ b/wearable/wear/WearVerifyRemoteApp/gradle.properties @@ -0,0 +1,20 @@ + +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Settings specified in this file will override any Gradle settings +# configured through the IDE. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + diff --git a/wearable/wear/WearVerifyRemoteApp/template-params.xml b/wearable/wear/WearVerifyRemoteApp/template-params.xml index 5e93583b..c1a8420c 100644 --- a/wearable/wear/WearVerifyRemoteApp/template-params.xml +++ b/wearable/wear/WearVerifyRemoteApp/template-params.xml @@ -23,17 +23,17 @@ <!-- change minSdk if needed--> <minSdk>23</minSdk> <minSdkVersionWear>23</minSdkVersionWear> - <targetSdkVersion>27</targetSdkVersion> - <targetSdkVersionWear>26</targetSdkVersionWear> + <targetSdkVersion>28</targetSdkVersion> + <targetSdkVersionWear>28</targetSdkVersionWear> <wearable> <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.google.android.support:wearable:2.3.0</dependency> + <dependency>com.google.android.support:wearable:2.4.0</dependency> - <dependency_wearable>com.android.support:wear:27.1.1</dependency_wearable> + <dependency_wearable>com.android.support:wear:28.0.0</dependency_wearable> <!-- Include additional dependencies here.--> <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency --> |