Remove maps v3beta

ApiDemos/java/.gitignore

@@ -1,5 +1,6 @@
 .gradle
 /local.properties
+/local.defaults.properties
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store

ApiDemos/java/app/build.gradle

@@ -1,18 +1,16 @@
-import org.apache.tools.ant.filters.ConcatFilter
-
 plugins {
     id 'com.android.application'
     id 'project-report'
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "com.example.mapdemo"
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -23,19 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    flavorDimensions "version"
-    productFlavors {
-        gms {
-            dimension "version"
-            applicationIdSuffix ".gms"
-            versionNameSuffix "-gms"
-        }
-        v3 {
-            dimension "version"
-            applicationIdSuffix ".v3"
-            versionNameSuffix "-v3"
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -47,42 +32,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation 'com.android.volley:volley:1.2.1'
-
-    // GMS
-    gmsImplementation 'com.google.android.gms:play-services-maps:18.1.0'
-
-    // V3
-    v3Implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
-
-    // Tests
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-}
-
-// Deprecated
-task generateV3(type: Copy) {
-    group "V3 Beta"
-    description "Copies source code from GMS to V3 BETA."
-
-    from 'src/gms/java'
-    into 'src/v3/java'
-    filter { line ->
-        line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps')
-    }
-    filter(ConcatFilter, prepend: file('../../V3_FILE_HEADER'))
-}
-
-// Deprecated
-task generateV3Layout(type: Copy) {
-    group "V3 Beta"
-    description "Copies layout files from GMS to V3 BETA."
-
-    from 'src/gms/res/layout'
-    into 'src/v3/res/layout'
-    filter { line ->
-        line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps')
-    }
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
 }
 
 secrets {

ApiDemos/java/app/proguard-rules.pro

@@ -13,7 +13,6 @@
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Fragment
--keep public class * extends android.support.v4.app.Fragment
 
 # The Maps API uses custom Parcelables.
 # Use this rule (which is slightly broader than the standard recommended one)