From 87955bc158517c1ed162aa2b06dbcce922faabc1 Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Tue, 7 Apr 2020 14:47:51 -0700
Subject: [PATCH] build: Fixing build issues.

---
 .github/workflows/build.yml                       |  2 +-
 .../layout/street_view_panorama_options_demo.xml  |  2 +-
 .../src/main/res/layout/visible_region_demo.xml   |  5 -----
 WearOS/Wearable/build.gradle                      | 15 +++++++--------
 .../java/com/example/wearosmap/MainActivity.java  |  5 ++---
 WearOS/build.gradle                               |  4 +++-
 WearOS/gradle.properties                          |  5 ++++-
 WearOS/gradle/wrapper/gradle-wrapper.properties   |  2 +-
 8 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5cddb524..0b9834c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
   repository_dispatch:
     types: [ build ]
   schedule:
-    cron: '0 0 * * 1'
+    - cron: '0 0 * * 1'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
diff --git a/ApiDemos/java/app/src/main/res/layout/street_view_panorama_options_demo.xml b/ApiDemos/java/app/src/main/res/layout/street_view_panorama_options_demo.xml
index 6cff9bf4..e4838e02 100755
--- a/ApiDemos/java/app/src/main/res/layout/street_view_panorama_options_demo.xml
+++ b/ApiDemos/java/app/src/main/res/layout/street_view_panorama_options_demo.xml
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_alignTop="@id/map"
+        android:layout_alignTop="@+id/streetviewpanorama"
         android:padding="6dp"
         android:background="@color/white"
         android:orientation="vertical">
diff --git a/ApiDemos/kotlin/app/src/main/res/layout/visible_region_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/visible_region_demo.xml
index 1228158a..cd66ac06 100755
--- a/ApiDemos/kotlin/app/src/main/res/layout/visible_region_demo.xml
+++ b/ApiDemos/kotlin/app/src/main/res/layout/visible_region_demo.xml
@@ -46,7 +46,6 @@
                 android:padding="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setNoPadding"
                 android:text="@string/vr_normal_button" />
 
             <Button
@@ -54,7 +53,6 @@
                 android:padding="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setMorePadding"
                 android:text="@string/vr_more_padded_button" />
 
             <Button
@@ -62,7 +60,6 @@
                 android:padding="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="moveToOperaHouse"
                 android:text="@string/vr_opera_house_button" />
 
             <Button
@@ -70,7 +67,6 @@
                 android:padding="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="moveToSFO"
                 android:text="@string/vr_sfo_button" />
 
             <Button
@@ -78,7 +74,6 @@
                 android:padding="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="moveToAUS"
                 android:text="@string/vr_australia_button" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/WearOS/Wearable/build.gradle b/WearOS/Wearable/build.gradle
index 401dd6bb..3c17ac6c 100644
--- a/WearOS/Wearable/build.gradle
+++ b/WearOS/Wearable/build.gradle
@@ -18,13 +18,12 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.example.wearos"
         minSdkVersion 21
-        targetSdkVersion 22
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -41,14 +40,14 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Required for DismissOverlayView to exit full screen wearable app.
-    compile 'com.google.android.support:wearable:1.2.0'
+    implementation 'com.google.android.support:wearable:2.5.0'
 
-    // Required to support ambient mode.
-    provided 'com.google.android.wearable:wearable:1.0.0'
+//    // Required to support ambient mode.
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
     // Include the Google Maps Android API from Google Play Services.
-    compile 'com.google.android.gms:play-services-maps:8.1.0'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
 }
diff --git a/WearOS/Wearable/src/main/java/com/example/wearosmap/MainActivity.java b/WearOS/Wearable/src/main/java/com/example/wearosmap/MainActivity.java
index dc0d7dae..dca04160 100644
--- a/WearOS/Wearable/src/main/java/com/example/wearosmap/MainActivity.java
+++ b/WearOS/Wearable/src/main/java/com/example/wearosmap/MainActivity.java
@@ -16,6 +16,8 @@
 
 package com.example.wearosmap;
 
+import android.support.wearable.activity.WearableActivity;
+import android.support.wearable.view.DismissOverlayView;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapFragment;
@@ -23,10 +25,7 @@ import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.support.wearable.activity.WearableActivity;
-import android.support.wearable.view.DismissOverlayView;
 import android.view.View;
 import android.view.WindowInsets;
 import android.widget.FrameLayout;
diff --git a/WearOS/build.gradle b/WearOS/build.gradle
index 70255946..27b12d9f 100644
--- a/WearOS/build.gradle
+++ b/WearOS/build.gradle
@@ -18,10 +18,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -30,6 +31,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/WearOS/gradle.properties b/WearOS/gradle.properties
index 16704cbe..09bff0bc 100644
--- a/WearOS/gradle.properties
+++ b/WearOS/gradle.properties
@@ -31,4 +31,7 @@
 # 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
\ No newline at end of file
+# org.gradle.parallel=true
+
+android.useAndroidX = true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties
index f2ca1b71..83d3c525 100644
--- a/WearOS/gradle/wrapper/gradle-wrapper.properties
+++ b/WearOS/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip