feat: removed v3

.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

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:<latest-version>'
-}
-```
-
 _**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

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')
- }
-}

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

maps-ktx/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright 2020 Google Inc.
+ ~ Copyright 2023 Google Inc.
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
  ~ limitations under the License.
  ~
  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest/>

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

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'