From 7923f0a8f79a871b3ab4543c5db344d6721580aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Fri, 15 Sep 2023 09:32:51 +0200 Subject: [PATCH] feat: removed v3 --- .github/workflows/docs.yml | 4 +- README.md | 18 ------ build.gradle | 32 +--------- maps-ktx/build.gradle | 4 +- maps-ktx/src/main/AndroidManifest.xml | 4 +- maps-utils-ktx/build.gradle | 2 - maps-utils-v3-ktx/.gitignore | 3 - maps-utils-v3-ktx/README.md | 8 --- maps-utils-v3-ktx/build.gradle | 61 ------------------- maps-utils-v3-ktx/consumer-rules.pro | 0 maps-utils-v3-ktx/proguard-rules.pro | 21 ------- .../src/main/AndroidManifest.xml | 1 - maps-v3-ktx/.gitignore | 3 - maps-v3-ktx/README.md | 8 --- maps-v3-ktx/build.gradle | 57 ----------------- maps-v3-ktx/consumer-rules.pro | 0 maps-v3-ktx/proguard-rules.pro | 21 ------- maps-v3-ktx/src/main/AndroidManifest.xml | 17 ------ settings.gradle | 2 - 19 files changed, 7 insertions(+), 259 deletions(-) delete mode 100644 maps-utils-v3-ktx/.gitignore delete mode 100644 maps-utils-v3-ktx/README.md delete mode 100644 maps-utils-v3-ktx/build.gradle delete mode 100644 maps-utils-v3-ktx/consumer-rules.pro delete mode 100644 maps-utils-v3-ktx/proguard-rules.pro delete mode 100644 maps-utils-v3-ktx/src/main/AndroidManifest.xml delete mode 100644 maps-v3-ktx/.gitignore delete mode 100644 maps-v3-ktx/README.md delete mode 100644 maps-v3-ktx/build.gradle delete mode 100644 maps-v3-ktx/consumer-rules.pro delete mode 100644 maps-v3-ktx/proguard-rules.pro delete mode 100644 maps-v3-ktx/src/main/AndroidManifest.xml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a367d23e..46c9b456 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -39,12 +39,10 @@ jobs: echo "Creating tar for generated docs" cd $GITHUB_WORKSPACE/maps-utils-ktx/build/documentation && tar cvf ~/maps-utils-docs.tar . cd $GITHUB_WORKSPACE/maps-ktx/build/documentation && tar cvf ~/maps-docs.tar . - cd $GITHUB_WORKSPACE/maps-v3-ktx/build/documentation && tar cvf ~/maps-v3-docs.tar . - cd $GITHUB_WORKSPACE/maps-utils-v3-ktx/build/documentation && tar cvf ~/maps-utils-v3-docs.tar . echo "Unpacking tar into gh-pages branch" git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* - cd $GITHUB_WORKSPACE && git checkout gh-pages && tar xvf ~/maps-docs.tar && tar xvf ~/maps-utils-docs.tar && tar xvf ~/maps-v3-docs.tar && tar xvf ~/maps-utils-v3-docs.tar + cd $GITHUB_WORKSPACE && git checkout gh-pages && tar xvf ~/maps-docs.tar && tar xvf ~/maps-utils-docs.tar # Commit changes and create a PR - name: PR Changes diff --git a/README.md b/README.md index efc3b51b..978d257b 100644 --- a/README.md +++ b/README.md @@ -38,24 +38,6 @@ dependencies { } ``` -(**Deprecated**) ~Alternatively, if you are using the Maps SDK through the standalone V3 BETA distribution:~ - -```groovy -dependencies { - - // KTX for the Maps SDK for Android V3 BETA Library - implementation 'com.google.maps.android:maps-v3-ktx:3.4.0' - - // KTX for the Maps SDK for Android V3 BETA Utility Library - implementation 'com.google.maps.android:maps-utils-v3-ktx:3.4.0' - - // It is recommended to also include the latest Maps SDK and/or Utility Library versions - // as well to ensure that you have the latest features and bug fixes. - implementation 'com.google.android.libraries.maps:maps:3.4.0-beta' - implementation 'com.google.maps.android:android-maps-utils-v3:' -} -``` - _**Note**_: The Beta version of the SDK is deprecated and scheduled for decommissioning. A future version of the SDK will provide similar support for Beta features. See the [release notes](https://developers.google.com/maps/documentation/android-sdk/releases#2021-08-18) for more information. ## Example Usage diff --git a/build.gradle b/build.gradle index 52c027a7..dbaecd0a 100644 --- a/build.gradle +++ b/build.gradle @@ -42,8 +42,7 @@ buildscript { ext.deps = [ 'androidMapsUtils' : [ - 'gms': "com.google.maps.android:android-maps-utils:$versions.androidMapsUtils", - 'v3' : "com.google.maps.android:android-maps-utils-v3:$versions.androidMapsUtils" + 'gms': "com.google.maps.android:android-maps-utils:$versions.androidMapsUtils" ], 'androidx' : [ 'appcompat': "androidx.appcompat:appcompat:$versions.androidx.appcompat", @@ -80,9 +79,7 @@ buildscript { ext.projectArtifactId = { project -> if (project.name == 'maps-utils-ktx' || - project.name == 'maps-ktx' || - project.name == 'maps-v3-ktx' || - project.name == 'maps-utils-v3-ktx') { + project.name == 'maps-ktx') { return project.name } else { return null @@ -224,30 +221,7 @@ subprojects { project -> } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } -/** - * This task will copy all of the source code in this module into the `maps-v3-ktx` module - * and change its imports from the Maps SDK on Play Services to the Standalone V3 Beta Maps SDK. - */ -task copyGmsToV3Beta(type: Copy) { - from 'maps-ktx/src' - into 'maps-v3-ktx/src' - filter { line -> - line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps') - } -} - -/** - * This task will copy all of the source code in this module into the `maps-v3-ktx` module - * and change its imports from the Maps SDK on Play Services to the Standalone V3 Beta Maps SDK. - */ -task copyGmsUtilsToV3Beta(type: Copy) { - from 'maps-utils-ktx/src' - into 'maps-utils-v3-ktx/src' - filter { line -> - line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps') - } -} diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle index 15742c41..8a9f43e8 100644 --- a/maps-ktx/build.gradle +++ b/maps-ktx/build.gradle @@ -39,11 +39,9 @@ android { freeCompilerArgs += '-Xexplicit-api=strict' jvmTarget = "1.8" } - namespace 'com.google.maps.android.v3.ktx' + namespace 'com.google.maps.android.ktx' } -preBuild.dependsOn(rootProject.tasks.copyGmsToV3Beta) - dependencies { implementation deps.kotlin implementation deps.kotlinxCoroutines diff --git a/maps-ktx/src/main/AndroidManifest.xml b/maps-ktx/src/main/AndroidManifest.xml index 2b68edbd..562b2f48 100644 --- a/maps-ktx/src/main/AndroidManifest.xml +++ b/maps-ktx/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle index b1bb15c0..067b6b33 100644 --- a/maps-utils-ktx/build.gradle +++ b/maps-utils-ktx/build.gradle @@ -45,8 +45,6 @@ android { namespace 'com.google.maps.android.ktx.utils' } -preBuild.dependsOn(rootProject.tasks.copyGmsUtilsToV3Beta) - dependencies { implementation deps.kotlin api deps.androidMapsUtils.gms diff --git a/maps-utils-v3-ktx/.gitignore b/maps-utils-v3-ktx/.gitignore deleted file mode 100644 index eba6c0d4..00000000 --- a/maps-utils-v3-ktx/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build -src/main/java/* -src/test/* diff --git a/maps-utils-v3-ktx/README.md b/maps-utils-v3-ktx/README.md deleted file mode 100644 index d94189b0..00000000 --- a/maps-utils-v3-ktx/README.md +++ /dev/null @@ -1,8 +0,0 @@ -maps-utils-v3-ktx -================= - -This module contains Kotlin extensions (KTX) for the Maps SDK Utility V3 BETA library for Android. - -**NOTE**: The source code in this module is autogenerated from source code within the `maps-utils-ktx` -module (on `maps-utils-ktx` compilation) and is not intended for modifications. Please make any code -changes in the `maps-utils-ktx` module. diff --git a/maps-utils-v3-ktx/build.gradle b/maps-utils-v3-ktx/build.gradle deleted file mode 100644 index 569c64e3..00000000 --- a/maps-utils-v3-ktx/build.gradle +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2020 Google Inc. - * - * 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. - */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdk versions.android.compileSdk - buildToolsVersion versions.android.buildTools - - defaultConfig { - minSdkVersion versions.android.minSdk - targetSdkVersion versions.android.targetSdk - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - libraryVariants.configureEach { - it.generateBuildConfig.enabled = false - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "1.8" - } - namespace 'com.google.maps.android.ktx.utils' -} - -dependencies { - implementation deps.kotlin - implementation deps.kotlinxCoroutines - implementation deps.volley - api deps.androidMapsUtils.v3 - api deps.mapsBeta - - // Tests - testImplementation deps.androidx.test - testImplementation deps.androidx.junit - testImplementation deps.junit - testImplementation deps.mockito - testImplementation deps.mockitoKotlin -} diff --git a/maps-utils-v3-ktx/consumer-rules.pro b/maps-utils-v3-ktx/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/maps-utils-v3-ktx/proguard-rules.pro b/maps-utils-v3-ktx/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/maps-utils-v3-ktx/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/maps-utils-v3-ktx/src/main/AndroidManifest.xml b/maps-utils-v3-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 94cbbcfc..00000000 --- a/maps-utils-v3-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/maps-v3-ktx/.gitignore b/maps-v3-ktx/.gitignore deleted file mode 100644 index eba6c0d4..00000000 --- a/maps-v3-ktx/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build -src/main/java/* -src/test/* diff --git a/maps-v3-ktx/README.md b/maps-v3-ktx/README.md deleted file mode 100644 index c4a7749f..00000000 --- a/maps-v3-ktx/README.md +++ /dev/null @@ -1,8 +0,0 @@ -maps-v3-ktx -=========== - -This module contains Kotlin extensions (KTX) for the Maps SDK V3 BETA library for Android. - -**NOTE**: The source code in this module is autogenerated from source code within the `maps-ktx` -module (on `maps-ktx` compilation) and is not intended for modifications. Please make any code -changes in the `maps-ktx` module. diff --git a/maps-v3-ktx/build.gradle b/maps-v3-ktx/build.gradle deleted file mode 100644 index 336231d8..00000000 --- a/maps-v3-ktx/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2020 Google Inc. - * - * 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. - * - */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools - - defaultConfig { - minSdkVersion versions.android.minSdk - targetSdkVersion versions.android.targetSdk - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "1.8" - } - namespace 'com.google.maps.android.v3.ktx' -} - -dependencies { - implementation deps.kotlin - implementation deps.kotlinxCoroutines - implementation deps.volley - api deps.mapsBeta - - // Tests - testImplementation deps.androidx.test - testImplementation deps.androidx.junit - testImplementation deps.junit - testImplementation deps.mockito - testImplementation deps.mockitoKotlin -} diff --git a/maps-v3-ktx/consumer-rules.pro b/maps-v3-ktx/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/maps-v3-ktx/proguard-rules.pro b/maps-v3-ktx/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/maps-v3-ktx/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/maps-v3-ktx/src/main/AndroidManifest.xml b/maps-v3-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 2b68edbd..00000000 --- a/maps-v3-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/settings.gradle b/settings.gradle index e78758c6..5550cf28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,4 @@ include ':app' include ':maps-ktx' include ':maps-utils-ktx' -include ':maps-v3-ktx' rootProject.name='android-maps-ktx' -include ':maps-utils-v3-ktx'