fix: updated dependencies to solve compilation issue (#1557)

* fix: versions and dependencies updated to allow compilation * fix: duplicated libraries * fix: updated Gradle * fix: updated Manifest * fix: updated Gradle * fix: fixed header
googlemaps-samples · May 2, 2024 · 1df7d3d · 1df7d3d
1 parent a2928d6
commit 1df7d3d
Show file tree

Hide file tree

Showing 39 changed files with 1,448 additions and 889 deletions.
diff --git a/WearOS/Wearable/build.gradle b/WearOS/Wearable/build.gradle
@@ -21,7 +21,7 @@ plugins {
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.wearos"
@@ -37,6 +37,13 @@ android {
         }
     }
     namespace 'com.example.wearosmap'
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    kotlin {
+        jvmToolchain(17)
+    }
 }
 
 // [START maps_wear_os_dependencies]

diff --git a/WearOS/Wearable/src/main/AndroidManifest.xml b/WearOS/Wearable/src/main/AndroidManifest.xml
@@ -1,19 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  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.
-  -->
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2024 Google LLC
+    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
+        https://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.
+-->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -32,6 +28,9 @@
         <!-- API key for the Android Maps API v2. The value is defined in local.properties. -->
         <meta-data android:name="com.google.android.geo.API_KEY"
                    android:value="${GOOGLE_MAPS_API_KEY}"/>
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
 
         <!-- Reference the wearable shared library required to support ambient mode. -->
         <uses-library android:name="com.google.android.wearable" android:required="false" />

diff --git a/WearOS/build.gradle b/WearOS/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.3.2' apply false
+    id 'com.android.application' version '8.4.0' apply false
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
 }
diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Apr 24 17:08:14 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/snippets/app-compose/build.gradle b/snippets/app-compose/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.example.app_compose"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app-ktx/build.gradle b/snippets/app-ktx/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.example.app_ktx"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app-places-ktx/build.gradle b/snippets/app-places-ktx/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.example.app_places_ktx"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app-rx/build.gradle b/snippets/app-rx/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.example.app_maps_rx"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app-utils-ktx/build.gradle b/snippets/app-utils-ktx/build.gradle
@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace 'com.example.app_utils_ktx'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.app_utils_ktx"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app-utils/build.gradle b/snippets/app-utils/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.example.app_utils"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/snippets/app/build.gradle b/snippets/app/build.gradle
@@ -9,11 +9,11 @@ plugins {
 // [END maps_android_secrets_gradle_plugin]
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.google.maps.example"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 24 16:53:30 PDT 2024
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+#Wed May 01 14:29:09 CEST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle
@@ -28,11 +28,11 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.gms:play-services-maps:18.2.0'
     implementation 'com.google.android.libraries.places:places:3.4.0'
     implementation 'com.android.volley:volley:1.2.1'
+    implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")
     testImplementation'junit:junit:4.13.2'
 }
 

diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Apr 24 17:05:07 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists