chore: Using AGP 7.0.0 (#658)

* chore: Using AGP 7.0.0 * Use Java 11. * Using 'adopt' distribution * Ignore .java-version * Remove onClick from XML * Add abortOnError false.
2025-12-08 18:02:20 +00:00 · 2021-08-09 16:41:26 -07:00 · 2021-08-09 16:41:26 -07:00 · b92eeef28b
commit b92eeef28b
parent 24153565a2
28 changed files with 42 additions and 32 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -36,10 +36,11 @@ jobs:
    steps:
    - uses: actions/checkout@v2

-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: set up Java 11
+      uses: actions/setup-java@v2
      with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '11'

    - name: Uninstall NDK
      run: |
@ -72,10 +73,11 @@ jobs:
    steps:
    - uses: actions/checkout@v2

-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: set up Java 11
+      uses: actions/setup-java@v2
      with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '11'

    - name: Uninstall NDK
      run: |
@ -93,10 +95,11 @@ jobs:
    steps:
    - uses: actions/checkout@v2

-    - name: set up JDK 1.8
+    - name: set up Java 11
      uses: actions/setup-java@v1
      with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '11'

    - name: Build and check
      run: |
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@ build/
 *.iml
 local.properties
 .DS_Store
+.java-version
--- a/ApiDemos/java/build.gradle
+++ b/ApiDemos/java/build.gradle
@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

        // NOTE: Do not place your application dependencies here; they belong
--- a/ApiDemos/java/gradle.properties
+++ b/ApiDemos/java/gradle.properties
@ -18,4 +18,3 @@
 # org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
-GOOGLE_MAPS_API_KEY="AIzaSyBri0nHwJxuIs8KgdsGXdJLFvg1vviUMfo"
--- a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties
+++ b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/ApiDemos/kotlin/app/build.gradle
+++ b/ApiDemos/kotlin/app/build.gradle
@ -37,6 +37,9 @@ android {
            versionNameSuffix "-v3"
        }
    }
+    lintOptions {
+            abortOnError false
+    }
 }

 dependencies {
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt
@ -190,6 +190,9 @@ class CircleDemoActivity :
        }

        clickabilityCheckbox = findViewById(R.id.toggleClickability)
+        clickabilityCheckbox.setOnClickListener {
+            toggleClickability(it)
+        }

        val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment
        mapFragment.getMapAsync(this)
--- a/ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml
+++ b/ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml
@ -94,7 +94,6 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:checked="true"
-                android:onClick="toggleClickability"
                android:text="@string/clickable"/>
        </TableRow>

--- a/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CircleDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CircleDemoActivity.kt
@ -197,6 +197,9 @@ class CircleDemoActivity :
        }

        clickabilityCheckbox = findViewById(R.id.toggleClickability)
+        clickabilityCheckbox.setOnClickListener {
+            toggleClickability(it)
+        }

        val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment
        mapFragment.getMapAsync(this)
--- a/ApiDemos/kotlin/app/src/v3/res/layout/activity_circle_demo.xml
+++ b/ApiDemos/kotlin/app/src/v3/res/layout/activity_circle_demo.xml
@ -94,7 +94,6 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:checked="true"
-                android:onClick="toggleClickability"
                android:text="@string/clickable"/>
        </TableRow>

--- a/ApiDemos/kotlin/build.gradle
+++ b/ApiDemos/kotlin/build.gradle
@ -7,7 +7,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

--- a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/snippets/build.gradle
+++ b/snippets/build.gradle
@ -10,7 +10,7 @@ buildscript {
    // [END_EXCLUDE]
    dependencies {
        // [START_EXCLUDE]
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath "com.android.tools.build:gradle:7.0.0"
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
@ -29,4 +29,4 @@ allprojects {

 task clean(type: Delete) {
    delete rootProject.buildDir
-}
+}
--- a/snippets/gradle/wrapper/gradle-wrapper.properties
+++ b/snippets/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle
@ -6,7 +6,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/java/MapWithMarker/build.gradle
+++ b/tutorials/java/MapWithMarker/build.gradle
@ -6,7 +6,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

        // NOTE: Do not place your application dependencies here; they belong
--- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/java/Polygons/build.gradle
+++ b/tutorials/java/Polygons/build.gradle
@ -6,7 +6,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

        // NOTE: Do not place your application dependencies here; they belong
--- a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/java/StyledMap/build.gradle
+++ b/tutorials/java/StyledMap/build.gradle
@ -6,7 +6,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

        // NOTE: Do not place your application dependencies here; they belong
--- a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle
@ -7,7 +7,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/kotlin/MapWithMarker/build.gradle
+++ b/tutorials/kotlin/MapWithMarker/build.gradle
@ -7,7 +7,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

--- a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/tutorials/kotlin/Polygons/build.gradle
+++ b/tutorials/kotlin/Polygons/build.gradle
@ -7,7 +7,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.3.0"

--- a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip