chore: Update WearOS to use latest AGP. (#899)

Change-Id: I3b8eeb8a64024bb2ac891b1ae6091c1f2b2b9ec3
This commit is contained in:
Chris Arriola 2022-03-22 16:01:22 -07:00 committed by GitHub
parent 165cce8a37
commit 6e6bca2c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 52 deletions

View File

@ -21,12 +21,12 @@ plugins {
apply plugin: 'kotlin-android'
android {
compileSdkVersion 31
compileSdk 31
defaultConfig {
applicationId "com.example.wearos"
minSdkVersion 23
targetSdkVersion 31
minSdk 23
targetSdk 31
versionCode 1
versionName "1.0"
}
@ -38,19 +38,15 @@ android {
}
}
repositories {
mavenCentral()
}
// [START maps_wear_os_dependencies]
dependencies {
// [START_EXCLUDE]
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "androidx.core:core-ktx:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.core:core-ktx:1.7.0"
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10'
// [END_EXCLUDE]
compileOnly 'com.google.android.wearable:wearable:2.8.1'
implementation 'com.google.android.support:wearable:2.8.1'
compileOnly 'com.google.android.wearable:wearable:2.9.0'
implementation 'com.google.android.support:wearable:2.9.0'
implementation 'com.google.android.gms:play-services-maps:18.0.2'
// This dependency is necessary for ambient mode

View File

@ -14,24 +14,8 @@
* limitations under the License.
*/
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}
plugins {
id 'com.android.application' version '7.1.2' apply false
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
}

View File

@ -1,22 +1,6 @@
#
# Copyright (C) 2015 Google Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#Wed Apr 10 15:27:10 PDT 2013
#Tue Mar 22 15:50:30 PDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME

View File

@ -13,5 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
include ':Wearable'