From e6f8b8a913e0095221816745f9bd8bedd5ef467a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Wed, 6 Dec 2023 22:20:48 +0100 Subject: [PATCH] feat: updated targetSdk and compileSdk (#1428) * feat: updated targetSdk and compileSdk * docs: added licenses * docs: excluded markdown files from header check --- .github/header-checker-lint.yml | 1 - .github/snippet-bot.yml | 14 ++++++++++++++ ApiDemos/java/README.md | 2 +- ApiDemos/java/app/build.gradle | 8 ++++---- ApiDemos/java/build.gradle | 2 +- ApiDemos/kotlin/README.md | 2 +- ApiDemos/kotlin/app/build.gradle | 4 ++-- ApiDemos/kotlin/build.gradle | 4 ++-- .../app-compose/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../java/com/example/app_compose/MapsCompose.kt | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ .../src/main/res/values-night/themes.xml | 16 ++++++++++++++++ .../app-compose/src/main/res/values/colors.xml | 16 ++++++++++++++++ .../app-compose/src/main/res/values/strings.xml | 16 ++++++++++++++++ .../app-compose/src/main/res/values/themes.xml | 16 ++++++++++++++++ snippets/app-ktx/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../src/main/java/com/example/app_ktx/KTX.kt | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ snippets/app-ktx/src/main/res/values/colors.xml | 16 ++++++++++++++++ snippets/app-ktx/src/main/res/values/strings.xml | 16 ++++++++++++++++ snippets/app-ktx/src/main/res/values/themes.xml | 16 ++++++++++++++++ .../app-places-ktx/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ .../src/main/res/values-night/themes.xml | 16 ++++++++++++++++ .../src/main/res/values/colors.xml | 16 ++++++++++++++++ .../src/main/res/values/strings.xml | 16 ++++++++++++++++ .../src/main/res/values/themes.xml | 16 ++++++++++++++++ snippets/app-rx/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../src/main/java/com/example/app_rx/MapsRx.kt | 16 ++++++++++++++++ .../src/main/java/com/example/app_rx/PlacesRx.kt | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ .../app-rx/src/main/res/values-night/themes.xml | 16 ++++++++++++++++ snippets/app-rx/src/main/res/values/colors.xml | 16 ++++++++++++++++ snippets/app-rx/src/main/res/values/strings.xml | 16 ++++++++++++++++ snippets/app-rx/src/main/res/values/themes.xml | 16 ++++++++++++++++ .../app-utils-ktx/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ .../app-utils-ktx/src/main/res/values/colors.xml | 16 ++++++++++++++++ .../src/main/res/values/strings.xml | 16 ++++++++++++++++ snippets/app-utils/src/main/AndroidManifest.xml | 16 ++++++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 16 ++++++++++++++++ .../main/res/drawable/ic_launcher_background.xml | 16 ++++++++++++++++ .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 16 ++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 16 ++++++++++++++++ .../app-utils/src/main/res/values/colors.xml | 16 ++++++++++++++++ .../app-utils/src/main/res/values/strings.xml | 16 ++++++++++++++++ .../gms/java/com/google/maps/example/MapId.java | 16 ++++++++++++++++ .../java/com/google/maps/example/kotlin/MapId.kt | 16 ++++++++++++++++ .../java/CurrentPlaceDetailsOnMap/README.md | 2 +- .../CurrentPlaceDetailsOnMap/app/build.gradle | 4 ++-- .../java/CurrentPlaceDetailsOnMap/build.gradle | 4 ++-- tutorials/java/MapWithMarker/README.md | 2 +- tutorials/java/MapWithMarker/app/build.gradle | 4 ++-- tutorials/java/MapWithMarker/build.gradle | 4 ++-- tutorials/java/Polygons/README.md | 2 +- tutorials/java/Polygons/app/build.gradle | 4 ++-- tutorials/java/Polygons/build.gradle | 2 +- tutorials/java/StyledMap/README.md | 2 +- tutorials/java/StyledMap/app/build.gradle | 4 ++-- tutorials/java/StyledMap/build.gradle | 2 +- .../kotlin/CurrentPlaceDetailsOnMap/README.md | 2 +- .../CurrentPlaceDetailsOnMap/app/build.gradle | 4 ++-- tutorials/kotlin/MapWithMarker/README.md | 2 +- tutorials/kotlin/MapWithMarker/app/build.gradle | 4 ++-- tutorials/kotlin/MapWithMarker/build.gradle | 2 +- tutorials/kotlin/Polygons/README.md | 2 +- tutorials/kotlin/Polygons/app/build.gradle | 4 ++-- tutorials/kotlin/Polygons/build.gradle | 4 ++-- 83 files changed, 935 insertions(+), 42 deletions(-) diff --git a/.github/header-checker-lint.yml b/.github/header-checker-lint.yml index cd99ab88d..15a47cf60 100644 --- a/.github/header-checker-lint.yml +++ b/.github/header-checker-lint.yml @@ -27,7 +27,6 @@ sourceFileExtensions: - 'ts' - 'js' - 'java' - - 'md' - 'html' - 'txt' - 'kt' diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml index e69de29bb..aaa2d352b 100644 --- a/.github/snippet-bot.yml +++ b/.github/snippet-bot.yml @@ -0,0 +1,14 @@ +# Copyright 2023 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 +# +# 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. + diff --git a/ApiDemos/java/README.md b/ApiDemos/java/README.md index 89bf818a5..a8f8b971e 100644 --- a/ApiDemos/java/README.md +++ b/ApiDemos/java/README.md @@ -15,7 +15,7 @@ Android Studio’s “Build Variants” toolbar options. Pre-requisites -------------- -- Android SDK v33 +- Android API level 21+ - Latest Android Build Tools - Google Repository - Google Play Services diff --git a/ApiDemos/java/app/build.gradle b/ApiDemos/java/app/build.gradle index 58e67e5fd..b47beaf84 100644 --- a/ApiDemos/java/app/build.gradle +++ b/ApiDemos/java/app/build.gradle @@ -7,12 +7,12 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.mapdemo" minSdk 19 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" multiDexEnabled true @@ -36,8 +36,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } namespace "com.example.mapdemo" } diff --git a/ApiDemos/java/build.gradle b/ApiDemos/java/build.gradle index d8a0c78f2..beab4a9fc 100644 --- a/ApiDemos/java/build.gradle +++ b/ApiDemos/java/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" // NOTE: Do not place your application dependencies here; they belong diff --git a/ApiDemos/kotlin/README.md b/ApiDemos/kotlin/README.md index 3d68a27e0..c1077e122 100644 --- a/ApiDemos/kotlin/README.md +++ b/ApiDemos/kotlin/README.md @@ -15,7 +15,7 @@ Android Studio’s “Build Variants” toolbar options. Pre-requisites -------------- -- Android SDK v33 +- Android API level 21+ - Latest Android Build Tools - Google Repository - Google Play Services diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index f105664c7..98b53eecc 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -8,11 +8,11 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.kotlindemos" minSdk 19 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/ApiDemos/kotlin/build.gradle b/ApiDemos/kotlin/build.gradle index 62b62cd78..230752ba7 100644 --- a/ApiDemos/kotlin/build.gradle +++ b/ApiDemos/kotlin/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" @@ -26,6 +26,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/snippets/app-compose/src/main/AndroidManifest.xml b/snippets/app-compose/src/main/AndroidManifest.xml index 2fedc5649..eac8c6b7b 100644 --- a/snippets/app-compose/src/main/AndroidManifest.xml +++ b/snippets/app-compose/src/main/AndroidManifest.xml @@ -1,4 +1,20 @@ + + + + + + + diff --git a/snippets/app-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/snippets/app-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755bf..b89ac5f12 100644 --- a/snippets/app-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/snippets/app-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,4 +1,20 @@ + + diff --git a/snippets/app-compose/src/main/res/values-night/themes.xml b/snippets/app-compose/src/main/res/values-night/themes.xml index 1a9966333..0109254fc 100644 --- a/snippets/app-compose/src/main/res/values-night/themes.xml +++ b/snippets/app-compose/src/main/res/values-night/themes.xml @@ -1,3 +1,19 @@ + +