Skip to content

Commit 1df7d3d

Browse files
kikosokikoso
authored
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
1 parent a2928d6 commit 1df7d3d

File tree

39 files changed

+1448
-889
lines changed

39 files changed

+1448
-889
lines changed

‎WearOS/Wearable/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ plugins {
2121
apply plugin: 'kotlin-android'
2222

2323
android {
24-
compileSdk 33
24+
compileSdk 34
2525

2626
defaultConfig {
2727
applicationId "com.example.wearos"
@@ -37,6 +37,13 @@ android {
3737
}
3838
}
3939
namespace 'com.example.wearosmap'
40+
41+
kotlinOptions {
42+
jvmTarget = "17"
43+
}
44+
kotlin {
45+
jvmToolchain(17)
46+
}
4047
}
4148

4249
// [START maps_wear_os_dependencies]

‎WearOS/Wearable/src/main/AndroidManifest.xml

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
Copyright (C) 2015 Google Inc. All Rights Reserved.
4-
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
16-
-->
1+
<?xml version="1.0" encoding="utf-8"?><!--
2+
Copyright 2024 Google LLC
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
https://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
-->
1713

1814
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1915

@@ -32,6 +28,9 @@
3228
<!-- API key for the Android Maps API v2. The value is defined in local.properties. -->
3329
<meta-data android:name="com.google.android.geo.API_KEY"
3430
android:value="${GOOGLE_MAPS_API_KEY}"/>
31+
<meta-data
32+
android:name="com.google.android.wearable.standalone"
33+
android:value="true" />
3534

3635
<!-- Reference the wearable shared library required to support ambient mode. -->
3736
<uses-library android:name="com.google.android.wearable" android:required="false" />

‎WearOS/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
plugins {
18-
id 'com.android.application' version '8.3.2' apply false
18+
id 'com.android.application' version '8.4.0' apply false
1919
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
2020
id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
2121
}

‎WearOS/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Apr 24 17:08:14 PDT 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎snippets/app-compose/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.app_compose"
1313
minSdk 21
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app-ktx/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.app_ktx"
1313
minSdk 21
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app-places-ktx/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.app_places_ktx"
1313
minSdk 21
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app-rx/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.app_maps_rx"
1313
minSdk 24
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app-utils-ktx/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66

77
android {
88
namespace 'com.example.app_utils_ktx'
9-
compileSdk 33
9+
compileSdk 34
1010

1111
defaultConfig {
1212
applicationId "com.example.app_utils_ktx"
1313
minSdk 21
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app-utils/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.app_utils"
1313
minSdk 21
14-
targetSdk 33
14+
targetSdk 34
1515
versionCode 1
1616
versionName "1.0"
1717

‎snippets/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ plugins {
99
// [END maps_android_secrets_gradle_plugin]
1010

1111
android {
12-
compileSdk 33
12+
compileSdk 34
1313
defaultConfig {
1414
applicationId "com.google.maps.example"
1515
minSdk 24
16-
targetSdk 33
16+
targetSdk 34
1717
versionCode 1
1818
versionName "1.0"
1919
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎snippets/gradle/wrapper/gradle-wrapper.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 24 16:53:30 PDT 2024
2-
distributionBase=GRADLE_USER_HOME
3-
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
5-
zipStoreBase=GRADLE_USER_HOME
6-
zipStorePath=wrapper/dists
1+
#Wed May 01 14:29:09 CEST 2024
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
5+
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation fileTree(dir: 'libs', include: ['*.jar'])
3231
implementation 'androidx.appcompat:appcompat:1.6.1'
3332
implementation 'com.google.android.gms:play-services-maps:18.2.0'
3433
implementation 'com.google.android.libraries.places:places:3.4.0'
3534
implementation 'com.android.volley:volley:1.2.1'
35+
implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")
3636
testImplementation'junit:junit:4.13.2'
3737
}
3838

‎tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar

9.85 KB
Binary file not shown.

‎tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Apr 24 17:05:07 PDT 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)