Skip to content

Commit 5352000

Browse files
dkhawkdkhawk
committed
build(deps): update dependencies across codelab-maps-platform-101-android-kotlin
1 parent d31100c commit 5352000

11 files changed

Lines changed: 71 additions & 41 deletions

File tree

‎solution-ktx/app/build.gradle‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
4-
id 'kotlin-android-extensions'
54

65
// Add secrets-gradle-plugin here
76
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
87
}
98

109
android {
11-
compileSdk 32
12-
buildToolsVersion "29.0.3"
10+
namespace = "com.google.codelabs.buildyourfirstmap"
1311

12+
compileOptions {
13+
sourceCompatibility JavaVersion.VERSION_11
14+
targetCompatibility JavaVersion.VERSION_11
15+
}
16+
kotlinOptions {
17+
jvmTarget = "11"
18+
}
19+
20+
compileSdk 36
21+
1422
defaultConfig {
1523
applicationId "com.google.codelabs.buildyourfirstmap"
16-
minSdk 21
17-
targetSdk 32
24+
minSdk 24
25+
targetSdk 36
1826
versionCode 1
1927
versionName "1.0"
2028

@@ -35,24 +43,24 @@ dependencies {
3543
// [START_EXCLUDE]
3644
implementation fileTree(dir: 'libs', include: ['*.jar'])
3745
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
38-
implementation 'androidx.appcompat:appcompat:1.4.1'
39-
implementation 'androidx.core:core-ktx:1.7.0'
40-
implementation 'com.google.code.gson:gson:2.8.6'
46+
implementation 'androidx.appcompat:appcompat:1.7.1'
47+
implementation 'androidx.core:core-ktx:1.18.0'
48+
implementation 'com.google.code.gson:gson:2.14.0'
4149
testImplementation 'junit:junit:4.13.2'
4250

4351
// Dependency to include Maps SDK for Android
44-
implementation 'com.google.android.gms:play-services-maps:18.0.2'
45-
implementation 'com.google.maps.android:android-maps-utils:2.2.0'
52+
implementation 'com.google.android.gms:play-services-maps:20.0.0'
53+
implementation 'com.google.maps.android:android-maps-utils:4.5.2'
4654
// [END_EXCLUDE]
4755

4856
// Maps SDK for Android KTX Library
49-
implementation 'com.google.maps.android:maps-ktx:3.3.0'
57+
implementation 'com.google.maps.android:maps-ktx:6.0.1'
5058

5159
// Maps SDK for Android Utility Library KTX Library
52-
implementation 'com.google.maps.android:maps-utils-ktx:3.0.0'
60+
implementation 'com.google.maps.android:maps-utils-ktx:6.0.1'
5361

5462
// Lifecycle Runtime KTX Library
55-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
63+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
5664
}
5765
// [END maps_android_add_map_codelab_ktx_dependency]
5866

‎solution-ktx/app/src/main/java/com/google/codelabs/buildyourfirstmap/place/Place.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ data class Place(
3131

3232
override fun getSnippet(): String =
3333
address
34+
35+
override fun getZIndex(): Float? =
36+
0f
3437
}

‎solution-ktx/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.5.30'
4+
ext.kotlin_version = '2.2.0'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.0.4'
10+
classpath 'com.android.tools.build:gradle:8.13.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
1313
}

‎solution-ktx/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

‎solution/app/build.gradle‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
4-
id 'kotlin-android-extensions'
54

65
// Add secrets-gradle-plugin here
76
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
87
}
98

109
android {
11-
compileSdk 32
12-
buildToolsVersion "29.0.3"
10+
namespace = "com.google.codelabs.buildyourfirstmap"
1311

12+
compileOptions {
13+
sourceCompatibility JavaVersion.VERSION_11
14+
targetCompatibility JavaVersion.VERSION_11
15+
}
16+
kotlinOptions {
17+
jvmTarget = "11"
18+
}
19+
20+
compileSdk 36
21+
1422
defaultConfig {
1523
applicationId "com.google.codelabs.buildyourfirstmap"
16-
minSdk 21
17-
targetSdk 32
24+
minSdk 24
25+
targetSdk 36
1826
versionCode 1
1927
versionName "1.0"
2028

@@ -33,13 +41,13 @@ android {
3341
dependencies {
3442
implementation fileTree(dir: 'libs', include: ['*.jar'])
3543
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
36-
implementation 'androidx.appcompat:appcompat:1.4.1'
37-
implementation 'androidx.core:core-ktx:1.7.0'
38-
implementation 'com.google.code.gson:gson:2.8.6'
44+
implementation 'androidx.appcompat:appcompat:1.7.1'
45+
implementation 'androidx.core:core-ktx:1.18.0'
46+
implementation 'com.google.code.gson:gson:2.14.0'
3947

4048
// Dependency to include Maps SDK for Android
41-
implementation 'com.google.android.gms:play-services-maps:18.0.2'
42-
implementation 'com.google.maps.android:android-maps-utils:2.2.0'
49+
implementation 'com.google.android.gms:play-services-maps:20.0.0'
50+
implementation 'com.google.maps.android:android-maps-utils:4.5.2'
4351

4452
testImplementation 'junit:junit:4.13.2'
4553
}

‎solution/app/src/main/java/com/google/codelabs/buildyourfirstmap/place/Place.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ data class Place(
3131

3232
override fun getSnippet(): String =
3333
address
34+
35+
override fun getZIndex(): Float? =
36+
0f
3437
}

‎solution/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.5.30'
4+
ext.kotlin_version = '2.2.0'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.0.4'
10+
classpath 'com.android.tools.build:gradle:8.13.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
1313
}

‎solution/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

‎starter/app/build.gradle‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
4-
id 'kotlin-android-extensions'
54

65
// Add secrets-gradle-plugin here
76
}
87

98
android {
10-
compileSdk 32
11-
buildToolsVersion "29.0.3"
9+
namespace = "com.google.codelabs.buildyourfirstmap"
1210

11+
compileOptions {
12+
sourceCompatibility JavaVersion.VERSION_11
13+
targetCompatibility JavaVersion.VERSION_11
14+
}
15+
kotlinOptions {
16+
jvmTarget = "11"
17+
}
18+
19+
compileSdk 36
20+
1321
defaultConfig {
1422
applicationId "com.google.codelabs.buildyourfirstmap"
15-
minSdk 21
16-
targetSdk 32
23+
minSdk 24
24+
targetSdk 36
1725
versionCode 1
1826
versionName "1.0"
1927
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -31,12 +39,12 @@ android {
3139
dependencies {
3240
implementation fileTree(dir: 'libs', include: ['*.jar'])
3341
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
34-
implementation 'androidx.appcompat:appcompat:1.4.1'
35-
implementation 'androidx.core:core-ktx:1.7.0'
36-
implementation 'com.google.code.gson:gson:2.8.6'
42+
implementation 'androidx.appcompat:appcompat:1.7.1'
43+
implementation 'androidx.core:core-ktx:1.18.0'
44+
implementation 'com.google.code.gson:gson:2.14.0'
3745

3846
// Dependency to include Maps SDK for Android
39-
implementation 'com.google.android.gms:play-services-maps:18.0.2'
47+
implementation 'com.google.android.gms:play-services-maps:20.0.0'
4048

4149
testImplementation 'junit:junit:4.13.2'
4250
}

‎starter/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.5.30'
4+
ext.kotlin_version = '2.2.0'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.0.4'
10+
classpath 'com.android.tools.build:gradle:8.13.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
}
1313
}

0 commit comments

Comments
 (0)