diff --git a/WearOS/Wearable/build.gradle b/WearOS/Wearable/build.gradle index 4452c88f..74682f63 100644 --- a/WearOS/Wearable/build.gradle +++ b/WearOS/Wearable/build.gradle @@ -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 diff --git a/WearOS/build.gradle b/WearOS/build.gradle index 11f52a21..f981d16b 100644 --- a/WearOS/build.gradle +++ b/WearOS/build.gradle @@ -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 +} \ No newline at end of file diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties index d08e4588..4d098365 100644 --- a/WearOS/gradle/wrapper/gradle-wrapper.properties +++ b/WearOS/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/WearOS/settings.gradle b/WearOS/settings.gradle index ff969282..f78c2421 100644 --- a/WearOS/settings.gradle +++ b/WearOS/settings.gradle @@ -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'