Skip to content

build(deps)!: update dependencies across 1 packages #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dkhawk wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

build(deps)!: update dependencies across 1 packages #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions solution-ktx/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'

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

android {
compileSdk 32
buildToolsVersion "29.0.3"
namespace = "com.google.codelabs.buildyourfirstmap"

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}

compileSdk 36

defaultConfig {
applicationId "com.google.codelabs.buildyourfirstmap"
minSdk 21
targetSdk 32
minSdk 24
targetSdk 36
versionCode 1
versionName "1.0"

Expand All @@ -35,24 +43,24 @@ dependencies {
// [START_EXCLUDE]
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.core:core-ktx:1.18.0'
implementation 'com.google.code.gson:gson:2.14.0'
testImplementation 'junit:junit:4.13.2'

// Dependency to include Maps SDK for Android
implementation 'com.google.android.gms:play-services-maps:18.0.2'
implementation 'com.google.maps.android:android-maps-utils:2.2.0'
implementation 'com.google.android.gms:play-services-maps:20.0.0'
implementation 'com.google.maps.android:android-maps-utils:4.5.2'
// [END_EXCLUDE]

// Maps SDK for Android KTX Library
implementation 'com.google.maps.android:maps-ktx:3.3.0'
implementation 'com.google.maps.android:maps-ktx:6.0.1'

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

// Lifecycle Runtime KTX Library
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
}
// [END maps_android_add_map_codelab_ktx_dependency]

Expand Down
3 changes: 3 additions & 0 deletions solution-ktx/app/src/main/java/com/google/codelabs/buildyourfirstmap/place/Place.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ data class Place(

override fun getSnippet(): String =
address

override fun getZIndex(): Float? =
0f
}
4 changes: 2 additions & 2 deletions solution-ktx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.5.30'
ext.kotlin_version = '2.2.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:8.13.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"
}
Expand Down
2 changes: 1 addition & 1 deletion solution-ktx/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
28 changes: 18 additions & 10 deletions solution/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'

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

android {
compileSdk 32
buildToolsVersion "29.0.3"
namespace = "com.google.codelabs.buildyourfirstmap"

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}

compileSdk 36

defaultConfig {
applicationId "com.google.codelabs.buildyourfirstmap"
minSdk 21
targetSdk 32
minSdk 24
targetSdk 36
versionCode 1
versionName "1.0"

Expand All @@ -33,13 +41,13 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.core:core-ktx:1.18.0'
implementation 'com.google.code.gson:gson:2.14.0'

// Dependency to include Maps SDK for Android
implementation 'com.google.android.gms:play-services-maps:18.0.2'
implementation 'com.google.maps.android:android-maps-utils:2.2.0'
implementation 'com.google.android.gms:play-services-maps:20.0.0'
implementation 'com.google.maps.android:android-maps-utils:4.5.2'

testImplementation 'junit:junit:4.13.2'
}
Expand Down
3 changes: 3 additions & 0 deletions solution/app/src/main/java/com/google/codelabs/buildyourfirstmap/place/Place.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ data class Place(

override fun getSnippet(): String =
address

override fun getZIndex(): Float? =
0f
}
4 changes: 2 additions & 2 deletions solution/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.5.30'
ext.kotlin_version = '2.2.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:8.13.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"
}
Expand Down
2 changes: 1 addition & 1 deletion solution/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
26 changes: 17 additions & 9 deletions starter/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'

// Add secrets-gradle-plugin here
}

android {
compileSdk 32
buildToolsVersion "29.0.3"
namespace = "com.google.codelabs.buildyourfirstmap"

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}

compileSdk 36

defaultConfig {
applicationId "com.google.codelabs.buildyourfirstmap"
minSdk 21
targetSdk 32
minSdk 24
targetSdk 36
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -31,12 +39,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.core:core-ktx:1.18.0'
implementation 'com.google.code.gson:gson:2.14.0'

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

testImplementation 'junit:junit:4.13.2'
}
4 changes: 2 additions & 2 deletions starter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.5.30'
ext.kotlin_version = '2.2.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion starter/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
Loading