Update sample for template with androidx support.
Bug: 110369130
Test: Manually tested.
Change-Id: I3970f3005a490d33c8de2e0df45f056adf1b9f09
diff --git a/wearable/wear/WearNotifications/Shared/build.gradle b/wearable/wear/WearNotifications/Shared/build.gradle
index 0293c95..edb53d4 100644
--- a/wearable/wear/WearNotifications/Shared/build.gradle
+++ b/wearable/wear/WearNotifications/Shared/build.gradle
@@ -6,7 +6,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0-alpha15'
+ classpath 'com.android.tools.build:gradle:3.2.0-beta01'
}
}
@@ -18,8 +18,7 @@
}
dependencies {
-
- implementation 'androidx.legacy:legacy-support-v4:1.0.0-alpha1'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0-alpha3'
}
// The sample build uses multiple directories to
@@ -31,7 +30,7 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 'android-P'
+ compileSdkVersion 28
buildToolsVersion "27.0.3"
diff --git a/wearable/wear/WearNotifications/gradle.properties b/wearable/wear/WearNotifications/gradle.properties
index b8c0c3f..6511fc1 100644
--- a/wearable/wear/WearNotifications/gradle.properties
+++ b/wearable/wear/WearNotifications/gradle.properties
@@ -1,3 +1,22 @@
+
+# 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
+
android.useAndroidX = true
android.enableJetifier = true
-
diff --git a/wearable/wear/WearNotifications/template-params.xml b/wearable/wear/WearNotifications/template-params.xml
index 4268dcc..2639611 100644
--- a/wearable/wear/WearNotifications/template-params.xml
+++ b/wearable/wear/WearNotifications/template-params.xml
@@ -20,27 +20,31 @@
<package>com.example.android.wearable.wear.wearnotifications</package>
<minSdk>18</minSdk>
- <compileSdkVersion>27</compileSdkVersion>
- <targetSdkVersion>27</targetSdkVersion>
+ <compileSdkVersion>28</compileSdkVersion>
+ <targetSdkVersion>28</targetSdkVersion>
<minSdkVersionWear>23</minSdkVersionWear>
- <compileSdkVersionWear>26</compileSdkVersionWear>
- <targetSdkVersionWear>26</targetSdkVersionWear>
+ <compileSdkVersionWear>28</compileSdkVersionWear>
+ <targetSdkVersionWear>28</targetSdkVersionWear>
<multiDexEnabled>true</multiDexEnabled>
<wearable>
<has_handheld_app>true</has_handheld_app>
</wearable>
- <dependency>com.android.support:appcompat-v7:27.1.0</dependency>
- <dependency>com.android.support:cardview-v7:27.1.0</dependency>
- <dependency>com.android.support:design:27.1.0</dependency>
+ <androidX>true</androidX>
- <dependency_shared>com.android.support:support-v4:27.1.0</dependency_shared>
+ <dependency>androidx.appcompat:appcompat:1.0.0-alpha3</dependency>
+ <dependency>androidx.cardview:cardview:1.0.0-alpha3</dependency>
+ <dependency>com.google.android.material:material:1.0.0-alpha3</dependency>
+ <dependency>androidx.legacy:legacy-support-v13:1.0.0-alpha3</dependency>
- <dependency_wearable>com.android.support:appcompat-v7:27.1.0</dependency_wearable>
- <dependency_wearable>com.android.support:wear:27.1.0</dependency_wearable>
- <dependency_wearable>com.android.support:design:27.1.0</dependency_wearable>
+ <dependency_shared>androidx.legacy:legacy-support-v4:1.0.0-alpha3</dependency_shared>
+
+ <dependency_wearable>androidx.appcompat:appcompat:1.0.0-alpha3</dependency_wearable>
+ <dependency_wearable>androidx.wear:wear:1.0.0-alpha3</dependency_wearable>
+ <dependency_wearable>com.google.android.material:material:1.0.0-alpha3</dependency_wearable>
+ <dependency_wearable>androidx.legacy:legacy-support-v13:1.0.0-alpha3</dependency_wearable>
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
