From d32b3b4db158859b7e914f5f4a9abcbcc14d1800 Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Tue, 10 May 2022 18:02:18 -0600 Subject: [PATCH] fix: revert dependencies to last green build (#937) --- ApiDemos/kotlin/app/build.gradle | 2 +- ApiDemos/kotlin/build.gradle | 4 ++-- WearOS/Wearable/build.gradle | 2 +- WearOS/build.gradle | 2 +- snippets/app/build.gradle | 6 +++--- snippets/build.gradle | 2 +- tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle | 2 +- tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle | 2 +- tutorials/kotlin/MapWithMarker/build.gradle | 2 +- tutorials/kotlin/Polygons/build.gradle | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index c1968900..09adf250 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -57,7 +57,7 @@ dependencies { // GMS gmsImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' gmsImplementation 'com.google.android.gms:play-services-maps:18.0.2' - gmsImplementation 'com.google.maps.android:maps-ktx:3.4.0' + gmsImplementation 'com.google.maps.android:maps-ktx:3.3.0' // V3 v3Implementation 'com.google.android.libraries.maps:maps:3.1.0-beta' diff --git a/ApiDemos/kotlin/build.gradle b/ApiDemos/kotlin/build.gradle index 413f6829..21b1fb23 100644 --- a/ApiDemos/kotlin/build.gradle +++ b/ApiDemos/kotlin/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" diff --git a/WearOS/Wearable/build.gradle b/WearOS/Wearable/build.gradle index 7e20b9ff..74682f63 100644 --- a/WearOS/Wearable/build.gradle +++ b/WearOS/Wearable/build.gradle @@ -43,7 +43,7 @@ dependencies { // [START_EXCLUDE] implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.core:core-ktx:1.7.0" - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10' // [END_EXCLUDE] compileOnly 'com.google.android.wearable:wearable:2.9.0' implementation 'com.google.android.support:wearable:2.9.0' diff --git a/WearOS/build.gradle b/WearOS/build.gradle index 30b60a38..f981d16b 100644 --- a/WearOS/build.gradle +++ b/WearOS/build.gradle @@ -17,5 +17,5 @@ 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.21' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } \ No newline at end of file diff --git a/snippets/app/build.gradle b/snippets/app/build.gradle index 4735413d..71ac1553 100644 --- a/snippets/app/build.gradle +++ b/snippets/app/build.gradle @@ -54,7 +54,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.4.1' implementation "androidx.compose.foundation:foundation:1.2.0-alpha06" @@ -68,8 +68,8 @@ dependencies { implementation 'io.reactivex.rxjava3:rxjava:3.1.4' implementation 'com.google.android.libraries.places:places:2.5.0' - gmsImplementation 'com.google.maps.android:maps-ktx:3.4.0' - gmsImplementation 'com.google.maps.android:maps-compose:2.1.1' + gmsImplementation 'com.google.maps.android:maps-ktx:3.3.0' + gmsImplementation 'com.google.maps.android:maps-compose:2.0.0' gmsImplementation 'com.google.android.gms:play-services-maps:18.0.2' gmsImplementation 'com.google.maps.android:android-maps-utils:2.3.0' gmsImplementation 'com.google.maps.android:maps-rx:1.0.0' diff --git a/snippets/build.gradle b/snippets/build.gradle index ec58ca6d..e046c016 100644 --- a/snippets/build.gradle +++ b/snippets/build.gradle @@ -2,7 +2,7 @@ plugins { // [START_EXCLUDE] id 'com.android.application' version '7.1.2' apply false - id 'org.jetbrains.kotlin.android' version '1.6.21' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false // [END_EXCLUDE] id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false } diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle index ae27bd49..e097de6d 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle @@ -33,7 +33,7 @@ dependencies { }) implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.gms:play-services-maps:18.0.2' - implementation 'com.google.android.libraries.places:places:2.6.0' + implementation 'com.google.android.libraries.places:places:2.5.0' implementation 'com.android.volley:volley:1.2.1' testImplementation'junit:junit:4.13' implementation "androidx.core:core-ktx:1.7.0" diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle index 9287d3f3..449ae544 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.6.10' repositories { mavenCentral() google() diff --git a/tutorials/kotlin/MapWithMarker/build.gradle b/tutorials/kotlin/MapWithMarker/build.gradle index f8346919..5525fba4 100644 --- a/tutorials/kotlin/MapWithMarker/build.gradle +++ b/tutorials/kotlin/MapWithMarker/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() diff --git a/tutorials/kotlin/Polygons/build.gradle b/tutorials/kotlin/Polygons/build.gradle index 1fd2eb99..2ee67222 100644 --- a/tutorials/kotlin/Polygons/build.gradle +++ b/tutorials/kotlin/Polygons/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.6.10' repositories { mavenCentral() google()