From 58cf1c38926741a17114c83279976db20a68d4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Wed, 10 Jul 2024 23:11:45 +0200 Subject: [PATCH] chore: fixed build after the dependabot updates (#1697) * chore: fixed build after the dependabot updates * chore: increased minSdk to 21 * chore: compose updated * chore: fixed duplicates issue * chore: fixed duplicates issues * chore: fixed duplicates issues --- ApiDemos/java/app/build.gradle | 7 +++---- ApiDemos/java/build.gradle | 5 +---- .../java/gradle/wrapper/gradle-wrapper.properties | 4 ++-- ApiDemos/kotlin/app/build.gradle | 2 +- .../kotlin/gradle/wrapper/gradle-wrapper.properties | 4 ++-- WearOS/gradle/wrapper/gradle-wrapper.properties | 4 ++-- snippets/app-compose/build.gradle | 5 ++--- snippets/gradle/wrapper/gradle-wrapper.properties | 12 ++++++------ .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/java/MapWithMarker/app/build.gradle | 6 +++--- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/java/Polygons/app/build.gradle | 2 +- tutorials/java/Polygons/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/java/StyledMap/app/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/kotlin/MapWithMarker/app/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 20 files changed, 40 insertions(+), 45 deletions(-) diff --git a/ApiDemos/java/app/build.gradle b/ApiDemos/java/app/build.gradle index 41e2c3347..ef7020bcd 100644 --- a/ApiDemos/java/app/build.gradle +++ b/ApiDemos/java/app/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.example.mapdemo" - minSdk 19 + minSdk 21 targetSdk 34 versionCode 1 versionName "1.0" @@ -43,11 +43,10 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.7.0' - implementation "androidx.recyclerview:recyclerview:1.3.1" + implementation "androidx.recyclerview:recyclerview:1.3.2" implementation 'com.android.volley:volley:1.2.1' - + implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.0")) // GMS gmsImplementation 'com.google.android.gms:play-services-maps:19.0.0' diff --git a/ApiDemos/java/build.gradle b/ApiDemos/java/build.gradle index a559833af..4c7d41738 100644 --- a/ApiDemos/java/build.gradle +++ b/ApiDemos/java/build.gradle @@ -19,12 +19,9 @@ allprojects { mavenLocal() google() mavenCentral() - flatDir { - dirs 'libs' - } } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties index 7a9d8749c..1e548e906 100644 --- a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 07 08:42:16 CEST 2024 +#Wed Jul 10 22:13:55 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index c64da8b3f..0de426f98 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -11,7 +11,7 @@ android { compileSdk 34 defaultConfig { applicationId "com.example.kotlindemos" - minSdk 19 + minSdk 21 targetSdk 34 versionCode 1 versionName "1.0" diff --git a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties index 3cb797990..aec9105bd 100644 --- a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 07 08:42:40 CEST 2024 +#Wed Jul 10 22:13:18 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties index fb919c624..9fb31fc67 100644 --- a/WearOS/gradle/wrapper/gradle-wrapper.properties +++ b/WearOS/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 24 17:08:14 PDT 2024 +#Wed Jul 10 22:24:53 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/snippets/app-compose/build.gradle b/snippets/app-compose/build.gradle index f800d43f1..77d6f9ef4 100644 --- a/snippets/app-compose/build.gradle +++ b/snippets/app-compose/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' } @@ -24,9 +25,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - composeOptions { - kotlinCompilerExtensionVersion '1.5.0' - } + buildFeatures { compose true diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties index d2c3da09f..becbcd1f5 100644 --- a/snippets/gradle/wrapper/gradle-wrapper.properties +++ b/snippets/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 01 14:29:09 CEST 2024 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +#Wed Jul 10 22:14:33 CEST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index f029d6879..454c55ae6 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:43:21 CEST 2024 +#Wed Jul 10 22:15:41 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/java/MapWithMarker/app/build.gradle b/tutorials/java/MapWithMarker/app/build.gradle index 81dbff891..51d60abdc 100644 --- a/tutorials/java/MapWithMarker/app/build.gradle +++ b/tutorials/java/MapWithMarker/app/build.gradle @@ -7,7 +7,7 @@ android { compileSdk 34 defaultConfig { applicationId "com.example.mapwithmarker" - minSdk 19 + minSdk 21 targetSdk 34 versionCode 1 versionName "1.0" @@ -26,8 +26,8 @@ android { } dependencies { - implementation 'com.google.android.gms:play-services-maps:18.2.0' - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.google.android.gms:play-services-maps:19.0.0' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.0")) implementation 'androidx.appcompat:appcompat:1.7.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 1fb1c93b4..261f84537 100644 --- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:46:26 CEST 2024 +#Wed Jul 10 22:16:57 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/java/Polygons/app/build.gradle b/tutorials/java/Polygons/app/build.gradle index 5d74d699b..dacce782d 100644 --- a/tutorials/java/Polygons/app/build.gradle +++ b/tutorials/java/Polygons/app/build.gradle @@ -26,9 +26,9 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.gms:play-services-maps:19.0.0' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.0")) testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' diff --git a/tutorials/java/Polygons/build.gradle b/tutorials/java/Polygons/build.gradle index ee783a0e2..03eee02a5 100644 --- a/tutorials/java/Polygons/build.gradle +++ b/tutorials/java/Polygons/build.gradle @@ -21,6 +21,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties index 44be27d77..a52580c21 100644 --- a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:48:57 CEST 2024 +#Wed Jul 10 22:17:21 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/java/StyledMap/app/build.gradle b/tutorials/java/StyledMap/app/build.gradle index acd43fa2e..0a1101100 100644 --- a/tutorials/java/StyledMap/app/build.gradle +++ b/tutorials/java/StyledMap/app/build.gradle @@ -30,9 +30,9 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.gms:play-services-maps:19.0.0' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.0")) testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' diff --git a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties index acfd336d5..5f9157f5f 100644 --- a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 24 17:07:25 PDT 2024 +#Wed Jul 10 22:17:43 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 834af080b..477c643c3 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:50:46 CEST 2024 +#Wed Jul 10 22:18:21 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/kotlin/MapWithMarker/app/build.gradle b/tutorials/kotlin/MapWithMarker/app/build.gradle index 3d0dfeee3..00a198aab 100644 --- a/tutorials/kotlin/MapWithMarker/app/build.gradle +++ b/tutorials/kotlin/MapWithMarker/app/build.gradle @@ -8,7 +8,7 @@ android { compileSdk 34 defaultConfig { applicationId "com.example.mapwithmarker" - minSdk 19 + minSdk 21 targetSdk 34 versionCode 1 versionName "1.0" diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index fd632dfde..7180069d9 100644 --- a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:51:23 CEST 2024 +#Wed Jul 10 22:19:11 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties index b20602abf..b490b8cce 100644 --- a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue May 07 08:52:32 CEST 2024 +#Wed Jul 10 22:20:02 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME