build: Fixing build issues.

This commit is contained in:
Chris Arriola 2020-04-07 14:47:51 -07:00
parent ff3beafa80
commit 87955bc158
8 changed files with 19 additions and 21 deletions

View File

@ -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:

View File

@ -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">

View File

@ -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>

View File

@ -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'
}

View File

@ -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;

View File

@ -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()
}
}

View File

@ -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
# org.gradle.parallel=true
android.useAndroidX = true
android.enableJetifier=true

View File

@ -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