From b20987b9c33c577b0964d53e598f1802bb36a345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Tue, 20 Dec 2022 22:50:58 +0100 Subject: [PATCH] chore(dependencies): general update of dependencies (#1107) * chore(dependencies): general update of dependencies * doc: updated API level for WearOS * chore: updated API level for WearOS * chore: moved namespace to Gradle file Co-authored-by: Angela Yu <5506675+wangela@users.noreply.github.com> --- ApiDemos/java/README.md | 3 +- ApiDemos/java/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ApiDemos/kotlin/README.md | 3 +- ApiDemos/kotlin/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 6 ++-- WearOS/README.md | 3 +- WearOS/Wearable/build.gradle | 7 ++-- WearOS/Wearable/src/main/AndroidManifest.xml | 3 +- WearOS/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- snippets/app/build.gradle | 34 +++++++++---------- snippets/app/src/main/AndroidManifest.xml | 3 +- snippets/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/CurrentPlaceDetailsOnMap/README.md | 2 +- .../CurrentPlaceDetailsOnMap/app/build.gradle | 9 ++--- .../app/src/main/AndroidManifest.xml | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/MapWithMarker/README.md | 3 +- tutorials/java/MapWithMarker/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/Polygons/README.md | 3 +- tutorials/java/Polygons/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/StyledMap/README.md | 3 +- tutorials/java/StyledMap/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../kotlin/CurrentPlaceDetailsOnMap/README.md | 3 +- .../CurrentPlaceDetailsOnMap/app/build.gradle | 9 ++--- .../app/src/main/AndroidManifest.xml | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 6 ++-- tutorials/kotlin/MapWithMarker/README.md | 2 +- .../kotlin/MapWithMarker/app/build.gradle | 6 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- tutorials/kotlin/Polygons/README.md | 3 +- tutorials/kotlin/Polygons/app/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 6 ++-- 38 files changed, 81 insertions(+), 90 deletions(-) diff --git a/ApiDemos/java/README.md b/ApiDemos/java/README.md index cb2fff593..89bf818a5 100644 --- a/ApiDemos/java/README.md +++ b/ApiDemos/java/README.md @@ -15,9 +15,8 @@ Android Studio’s “Build Variants” toolbar options. Pre-requisites -------------- -- Android SDK v30 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository - Google Repository - Google Play Services diff --git a/ApiDemos/java/app/build.gradle b/ApiDemos/java/app/build.gradle index 036a465c6..7fae9f931 100644 --- a/ApiDemos/java/app/build.gradle +++ b/ApiDemos/java/app/build.gradle @@ -7,12 +7,12 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.mapdemo" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" multiDexEnabled true diff --git a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties index 45efda8fa..d090fd5d5 100644 --- a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties @@ -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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/ApiDemos/kotlin/README.md b/ApiDemos/kotlin/README.md index c1d5bad28..3d68a27e0 100644 --- a/ApiDemos/kotlin/README.md +++ b/ApiDemos/kotlin/README.md @@ -15,9 +15,8 @@ Android Studio’s “Build Variants” toolbar options. Pre-requisites -------------- -- Android SDK v30 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository - Google Repository - Google Play Services diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index 7ed5597fe..54ab4b095 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -8,11 +8,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.kotlindemos" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties index c3f67c255..2169c175f 100644 --- a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 25 11:17:39 PST 2021 +#Sat Oct 29 00:59:00 CEST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/WearOS/README.md b/WearOS/README.md index 5bea5546d..90ba39dd5 100644 --- a/WearOS/README.md +++ b/WearOS/README.md @@ -8,9 +8,8 @@ gradle-based Android Studio project that [supports ambient mode](https://develop Pre-requisites -------------- -- Android SDK v22 +- Android SDK v31 - Latest Android Build Tools -- Android Support Repository - Wear OS emulator or device Getting Started diff --git a/WearOS/Wearable/build.gradle b/WearOS/Wearable/build.gradle index eca2b3214..008113e40 100644 --- a/WearOS/Wearable/build.gradle +++ b/WearOS/Wearable/build.gradle @@ -21,7 +21,7 @@ plugins { apply plugin: 'kotlin-android' android { - compileSdk 31 + compileSdk 33 defaultConfig { applicationId "com.example.wearos" @@ -36,18 +36,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'com.example.wearosmap' } // [START maps_wear_os_dependencies] dependencies { // [START_EXCLUDE] implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.core:core-ktx:1.7.0" + implementation "androidx.core:core-ktx:1.9.0" implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22' // [END_EXCLUDE] compileOnly 'com.google.android.wearable:wearable:2.9.0' implementation 'com.google.android.support:wearable:2.9.0' - implementation 'com.google.android.gms:play-services-maps:18.0.2' + implementation 'com.google.android.gms:play-services-maps:18.1.0' // This dependency is necessary for ambient mode implementation 'androidx.wear:wear:1.2.0' diff --git a/WearOS/Wearable/src/main/AndroidManifest.xml b/WearOS/Wearable/src/main/AndroidManifest.xml index 4c24df101..efa8efb5f 100644 --- a/WearOS/Wearable/src/main/AndroidManifest.xml +++ b/WearOS/Wearable/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + diff --git a/WearOS/build.gradle b/WearOS/build.gradle index 277f51e7f..9ca56dc15 100644 --- a/WearOS/build.gradle +++ b/WearOS/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'com.android.application' version '7.1.2' apply false + id 'com.android.application' version '7.3.1' apply false id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false id 'org.jetbrains.kotlin.android' version '1.7.22' apply false } \ No newline at end of file diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties index 4d0983659..8ff59b818 100644 --- a/WearOS/gradle/wrapper/gradle-wrapper.properties +++ b/WearOS/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Mar 22 15:50:30 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/snippets/app/build.gradle b/snippets/app/build.gradle index c72e0a7f8..95b8d9ca0 100644 --- a/snippets/app/build.gradle +++ b/snippets/app/build.gradle @@ -7,11 +7,11 @@ plugins { } android { - compileSdk 32 + compileSdk 33 defaultConfig { applicationId "com.google.maps.example" minSdk 24 - targetSdk 32 + targetSdk 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -25,7 +25,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.2.0-alpha06' + kotlinCompilerExtensionVersion '1.4.0-alpha02' } buildFeatures { @@ -50,29 +50,29 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.google.maps.example' } // [START maps_android_compose_dependency] dependencies { // [START_EXCLUDE silent] implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.22' - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation "androidx.compose.foundation:foundation:1.2.0-alpha06" - implementation "androidx.compose.material:material:1.2.0-alpha06" - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.21' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation "androidx.compose.foundation:foundation:1.4.0-alpha02" + implementation "androidx.compose.material:material:1.4.0-alpha02" + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' implementation 'com.android.volley:volley:1.2.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'io.reactivex.rxjava3:rxjava:3.1.4' - implementation 'com.google.android.libraries.places:places:2.5.0' - + implementation 'com.google.android.libraries.places:places:2.7.0' gmsImplementation 'com.google.maps.android:maps-ktx:3.4.0' gmsImplementation 'com.google.maps.android:maps-compose:2.8.0' - gmsImplementation 'com.google.android.gms:play-services-maps:18.0.2' + gmsImplementation 'com.google.android.gms:play-services-maps:18.1.0' gmsImplementation 'com.google.maps.android:android-maps-utils:2.4.0' gmsImplementation 'com.google.maps.android:maps-rx:1.0.0' gmsImplementation 'com.google.maps.android:places-rx:1.0.0' @@ -82,7 +82,7 @@ dependencies { // [END_EXCLUDE] implementation 'com.google.maps.android:maps-compose:2.8.0' - implementation 'com.google.android.gms:play-services-maps:18.0.2' + implementation 'com.google.android.gms:play-services-maps:18.1.0' } // [END maps_android_compose_dependency] diff --git a/snippets/app/src/main/AndroidManifest.xml b/snippets/app/src/main/AndroidManifest.xml index bee6ff56f..0849952db 100644 --- a/snippets/app/src/main/AndroidManifest.xml +++ b/snippets/app/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ limitations under the License. --> - + diff --git a/snippets/build.gradle b/snippets/build.gradle index 3bfc50580..cc041f436 100644 --- a/snippets/build.gradle +++ b/snippets/build.gradle @@ -1,8 +1,8 @@ // [START maps_android_secrets_gradle_plugin_project_level_config] plugins { // [START_EXCLUDE] - id 'com.android.application' version '7.1.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.22' apply false + id 'com.android.application' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.21' apply false // [END_EXCLUDE] id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false } diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties index 88d15c5e3..9fae208ed 100644 --- a/snippets/gradle/wrapper/gradle-wrapper.properties +++ b/snippets/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Mar 21 15:55:38 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/README.md b/tutorials/java/CurrentPlaceDetailsOnMap/README.md index 7f51e9f28..f58454a59 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/README.md +++ b/tutorials/java/CurrentPlaceDetailsOnMap/README.md @@ -7,7 +7,7 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v31 +- Android SDK v33 - Latest Android Build Tools - Android Support Repository - Google Repository diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle index e4a4bb495..990ab7cb6 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle +++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.currentplacedetailsonmap" - minSdkVersion 19 - targetSdkVersion 31 + minSdkVersion 21 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -22,6 +22,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'com.example.currentplacedetailsonmap' } dependencies { @@ -33,7 +34,7 @@ dependencies { implementation 'com.google.android.gms:play-services-maps:18.1.0' implementation 'com.google.android.libraries.places:places:3.0.0' implementation 'com.android.volley:volley:1.2.1' - testImplementation'junit:junit:4.12' + testImplementation'junit:junit:4.13.2' } secrets { diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml index ed4f51c1b..b454593af 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml +++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 3344c76db..8f020ab8e 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -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.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/tutorials/java/MapWithMarker/README.md b/tutorials/java/MapWithMarker/README.md index 1c940d62b..16fedf644 100644 --- a/tutorials/java/MapWithMarker/README.md +++ b/tutorials/java/MapWithMarker/README.md @@ -7,9 +7,8 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v30 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository - Google Repository - Google Play Services diff --git a/tutorials/java/MapWithMarker/app/build.gradle b/tutorials/java/MapWithMarker/app/build.gradle index d2c225a28..d700c782f 100644 --- a/tutorials/java/MapWithMarker/app/build.gradle +++ b/tutorials/java/MapWithMarker/app/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.mapwithmarker" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 36f43b8b6..b9702fdb2 100644 --- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -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.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/tutorials/java/Polygons/README.md b/tutorials/java/Polygons/README.md index 1a3af32cd..2bfa1ec28 100644 --- a/tutorials/java/Polygons/README.md +++ b/tutorials/java/Polygons/README.md @@ -7,9 +7,8 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v29 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository Getting started --------------- diff --git a/tutorials/java/Polygons/app/build.gradle b/tutorials/java/Polygons/app/build.gradle index a10ff21f3..930561704 100644 --- a/tutorials/java/Polygons/app/build.gradle +++ b/tutorials/java/Polygons/app/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.polygons" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties index 433ccbe32..b2689707f 100644 --- a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -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.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/tutorials/java/StyledMap/README.md b/tutorials/java/StyledMap/README.md index 3a94291f6..936ee7828 100644 --- a/tutorials/java/StyledMap/README.md +++ b/tutorials/java/StyledMap/README.md @@ -7,9 +7,8 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v24 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository Getting started --------------- diff --git a/tutorials/java/StyledMap/app/build.gradle b/tutorials/java/StyledMap/app/build.gradle index 336f00d39..b280aa96d 100644 --- a/tutorials/java/StyledMap/app/build.gradle +++ b/tutorials/java/StyledMap/app/build.gradle @@ -10,11 +10,11 @@ if (rootProject.file("local.properties").exists()) { def mapsApiKey = properties.getProperty("MAPS_API_KEY", "") android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.styledmap" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties index 507b27304..bf525539f 100644 --- a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties @@ -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.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/README.md b/tutorials/kotlin/CurrentPlaceDetailsOnMap/README.md index 8dc480676..e8a3ded18 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/README.md +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/README.md @@ -7,9 +7,8 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v24 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository Getting started --------------- diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle index 39ba3ec34..695048e55 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle @@ -5,11 +5,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.currentplacedetailsonmap" - minSdkVersion 19 - targetSdkVersion 31 + minSdkVersion 21 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -23,6 +23,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'com.example.currentplacedetailsonmap' } dependencies { @@ -34,7 +35,7 @@ dependencies { implementation 'com.google.android.gms:play-services-maps:18.1.0' implementation 'com.google.android.libraries.places:places:3.0.0' implementation 'com.android.volley:volley:1.2.1' - testImplementation'junit:junit:4.13' + testImplementation'junit:junit:4.13.2' implementation "androidx.core:core-ktx:1.9.0" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml index ed4f51c1b..b454593af 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 02c0895a8..87d012586 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 27 11:35:42 PST 2021 +#Sun Nov 27 16:25:55 CET 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/kotlin/MapWithMarker/README.md b/tutorials/kotlin/MapWithMarker/README.md index fe7d9da47..4481104fb 100644 --- a/tutorials/kotlin/MapWithMarker/README.md +++ b/tutorials/kotlin/MapWithMarker/README.md @@ -7,7 +7,7 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v30 +- Android SDK v33 - Latest Android Build Tools - Android Support Repository - Google Repository diff --git a/tutorials/kotlin/MapWithMarker/app/build.gradle b/tutorials/kotlin/MapWithMarker/app/build.gradle index 3417103df..4ade40be4 100644 --- a/tutorials/kotlin/MapWithMarker/app/build.gradle +++ b/tutorials/kotlin/MapWithMarker/app/build.gradle @@ -5,12 +5,12 @@ plugins { } android { - compileSdkVersion 31 - buildToolsVersion "28.0.3" + compileSdkVersion 33 + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.example.mapwithmarker" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 69b617abc..ddf9a22ee 100644 --- a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon May 23 16:40:57 PDT 2022 +#Sun Nov 27 16:28:40 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/kotlin/Polygons/README.md b/tutorials/kotlin/Polygons/README.md index 1a3af32cd..2bfa1ec28 100644 --- a/tutorials/kotlin/Polygons/README.md +++ b/tutorials/kotlin/Polygons/README.md @@ -7,9 +7,8 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API: Prerequisites -------------- -- Android SDK v29 +- Android SDK v33 - Latest Android Build Tools -- Android Support Repository Getting started --------------- diff --git a/tutorials/kotlin/Polygons/app/build.gradle b/tutorials/kotlin/Polygons/app/build.gradle index ca536a07e..6e62ae3f3 100644 --- a/tutorials/kotlin/Polygons/app/build.gradle +++ b/tutorials/kotlin/Polygons/app/build.gradle @@ -5,11 +5,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.example.polygons" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties index d17826268..898fee0e8 100644 --- a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 27 11:41:00 PST 2021 +#Sun Nov 27 16:29:54 CET 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +zipStoreBase=GRADLE_USER_HOME