diff options
author | Jeremy Walker <jewalker@google.com> | 2019-04-02 15:35:31 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 15:35:31 -0700 |
commit | 24a19aeb8ba25d61036b63eaa5d07628c437126a (patch) | |
tree | 2bd840cf43722222df73693f6ce7c85b42776ae6 | |
parent | e3e62de9b190844706b5a79cf3261627540c92e6 (diff) | |
parent | a156fa518aa1a3d180274751f65a712cc86596bb (diff) | |
download | android-24a19aeb8ba25d61036b63eaa5d07628c437126a.tar.gz |
WearHighBandwidthNetworking: Updates to androidx. am: 7481b955db
am: a156fa518a
Change-Id: Ia0169683d1f04cd87ac435c1f545498399a7796a
4 files changed, 15 insertions, 14 deletions
diff --git a/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle b/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle index e2781577..40537eb2 100644 --- a/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle +++ b/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.2' } } @@ -21,12 +21,12 @@ repositories { dependencies { - implementation 'com.android.support:wear:27.1.1' + implementation 'androidx.wear:wear:1.0.0' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'com.google.android.gms:play-services-wearable:15.0.1' + implementation 'com.google.android.gms:play-services-wearable:16.0.1' - implementation 'com.android.support:support-v13:28.0.0' compileOnly 'com.google.android.wearable:wearable:2.4.0' @@ -54,7 +54,7 @@ android { minSdkVersion 24 - targetSdkVersion 26 + targetSdkVersion 28 multiDexEnabled true diff --git a/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/res/layout/activity_main.xml index 6bbf5143..99a9d204 100644 --- a/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/res/layout/activity_main.xml +++ b/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/res/layout/activity_main.xml @@ -46,7 +46,7 @@ </RelativeLayout> - <android.support.wear.widget.BoxInsetLayout + <androidx.wear.widget.BoxInsetLayout android:layout_width="match_parent" android:layout_height="match_parent"> @@ -97,5 +97,5 @@ android:visibility="gone" /> </RelativeLayout> - </android.support.wear.widget.BoxInsetLayout> + </androidx.wear.widget.BoxInsetLayout> </LinearLayout>
\ No newline at end of file diff --git a/wearable/wear/WearHighBandwidthNetworking/gradle.properties b/wearable/wear/WearHighBandwidthNetworking/gradle.properties new file mode 100644 index 00000000..5465fec0 --- /dev/null +++ b/wearable/wear/WearHighBandwidthNetworking/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true
\ No newline at end of file diff --git a/wearable/wear/WearHighBandwidthNetworking/template-params.xml b/wearable/wear/WearHighBandwidthNetworking/template-params.xml index 24373252..cd65f4cd 100644 --- a/wearable/wear/WearHighBandwidthNetworking/template-params.xml +++ b/wearable/wear/WearHighBandwidthNetworking/template-params.xml @@ -17,21 +17,20 @@ <sample> <name>WearHighBandwidthNetworking</name> - <group>Wearable</group> <!-- This field will be deprecated in the future - and replaced with the "categories" tags below. --> + <group>Wearable</group> <package>com.example.android.wearable.wear.wearhighbandwidthnetworking</package> <!-- change minSdk if needed--> <minSdk>24</minSdk> <minSdkVersionWear>24</minSdkVersionWear> - <targetSdkVersion>26</targetSdkVersion> - <targetSdkVersionWear>26</targetSdkVersionWear> + <targetSdkVersion>28</targetSdkVersion> + <targetSdkVersionWear>28</targetSdkVersionWear> <multiDexEnabled>true</multiDexEnabled> - <!-- Include additional dependencies here.--> - <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency --> - <dependency_wearable>com.android.support:wear:27.1.1</dependency_wearable> + <androidX>true</androidX> + <dependency_wearable>androidx.wear:wear:1.0.0</dependency_wearable> + <dependency_wearable>androidx.legacy:legacy-support-v13:1.0.0</dependency_wearable> <strings> <intro> |