diff options
| author | Jeremy Walker <jewalker@google.com> | 2018-03-12 15:39:37 -0700 |
|---|---|---|
| committer | Jeremy Walker <jewalker@google.com> | 2018-03-21 17:23:45 -0700 |
| commit | 6a59893dcfb0ffc187fdd98cbdd919479eca4f4b (patch) | |
| tree | f4e165cefd68f7a8b4ae5b45172fcdf834312585 /wearable/wear/RuntimePermissionsWear | |
| parent | f41ef25b7b7e87cdca5bdf88cc1293e44558e497 (diff) | |
| download | android-6a59893dcfb0ffc187fdd98cbdd919479eca4f4b.tar.gz | |
Replace all references to 'Android Wear' and replace with 'Wear' for
Wear OS launch.
Also, updates all libraries for 2.3 launch.
Bug: 74555070, 74427990
Test: All done manaully.
Change-Id: Ic8f11fe16cb3aa553bba6b59160ffad9ed70cbd1
Diffstat (limited to 'wearable/wear/RuntimePermissionsWear')
| -rw-r--r-- | wearable/wear/RuntimePermissionsWear/Shared/build.gradle | 6 | ||||
| -rw-r--r-- | wearable/wear/RuntimePermissionsWear/template-params.xml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle index dcd09077..95588db2 100644 --- a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle +++ b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle @@ -1,8 +1,8 @@ buildscript { repositories { - google() jcenter() + google() } dependencies { @@ -28,9 +28,9 @@ List<String> dirs = [ 'template'] // boilerplate code that is generated by the sample template process android { - compileSdkVersion 27 + compileSdkVersion 27 - buildToolsVersion "27.0.2" + buildToolsVersion "27.0.3" defaultConfig { minSdkVersion 18 diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml index 684e02aa..0a1863c7 100644 --- a/wearable/wear/RuntimePermissionsWear/template-params.xml +++ b/wearable/wear/RuntimePermissionsWear/template-params.xml @@ -21,7 +21,7 @@ <package>com.example.android.wearable.runtimepermissions</package> <minSdk>18</minSdk> - <targetSdkVersion>25</targetSdkVersion> + <targetSdkVersion>27</targetSdkVersion> <minSdkVersionWear>23</minSdkVersionWear> <compileSdkVersionWear>26</compileSdkVersionWear> @@ -32,10 +32,10 @@ <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.android.support:appcompat-v7:27.0.2</dependency> - <dependency>com.android.support:design:27.0.2</dependency> + <dependency>com.android.support:appcompat-v7:27.1,0</dependency> + <dependency>com.android.support:design:27.1.0</dependency> - <dependency_wearable>com.android.support:wear:27.0.2</dependency_wearable> + <dependency_wearable>com.android.support:wear:27.1.0</dependency_wearable> <strings> <intro> |