From b92eeef28b9f0aee484d43ef3c7f20071828b9ef Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Mon, 9 Aug 2021 16:41:26 -0700 Subject: [PATCH] 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. --- .github/workflows/build.yml | 19 +++++++++++-------- .gitignore | 1 + ApiDemos/java/build.gradle | 2 +- ApiDemos/java/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- ApiDemos/kotlin/app/build.gradle | 3 +++ .../example/kotlindemos/CircleDemoActivity.kt | 3 +++ .../gms/res/layout/activity_circle_demo.xml | 1 - .../example/kotlindemos/CircleDemoActivity.kt | 3 +++ .../v3/res/layout/activity_circle_demo.xml | 1 - ApiDemos/kotlin/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- snippets/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../CurrentPlaceDetailsOnMap/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/MapWithMarker/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/Polygons/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/java/StyledMap/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../CurrentPlaceDetailsOnMap/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/kotlin/MapWithMarker/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- tutorials/kotlin/Polygons/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 28 files changed, 42 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82613c7d..b9a82edf 100644 --- 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: | diff --git a/.gitignore b/.gitignore index 73145024..ee3cb603 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build/ *.iml local.properties .DS_Store +.java-version diff --git a/ApiDemos/java/build.gradle b/ApiDemos/java/build.gradle index 87303a11..6b4ba0ad 100644 --- 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 diff --git a/ApiDemos/java/gradle.properties b/ApiDemos/java/gradle.properties index 3e488398..acf164f6 100644 --- 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" diff --git a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties index 556ff5f3..49789c83 100644 --- 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 diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index 07611838..f4eaff64 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -37,6 +37,9 @@ android { versionNameSuffix "-v3" } } + lintOptions { + abortOnError false + } } dependencies { diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt index 0a5e8597..1f1e3011 100644 --- 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) diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml index 6b7c3c91..b64cf041 100644 --- 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"/> diff --git a/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CircleDemoActivity.kt b/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CircleDemoActivity.kt index fd171363..12c33da2 100644 --- 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) diff --git a/ApiDemos/kotlin/app/src/v3/res/layout/activity_circle_demo.xml b/ApiDemos/kotlin/app/src/v3/res/layout/activity_circle_demo.xml index 4234ae14..42156951 100644 --- 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"/> diff --git a/ApiDemos/kotlin/build.gradle b/ApiDemos/kotlin/build.gradle index 8e28e655..4b921a4a 100644 --- 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" diff --git a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties index ceb0ddea..a0b017fc 100644 --- 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 diff --git a/snippets/build.gradle b/snippets/build.gradle index 50ce0cec..d9acd9c7 100644 --- 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 -} \ No newline at end of file +} diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties index c378a138..de24f9d4 100644 --- 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 diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle index 530b7f2d..6005f4f6 100644 --- 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 diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index b7c71aea..e221a119 100644 --- 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 diff --git a/tutorials/java/MapWithMarker/build.gradle b/tutorials/java/MapWithMarker/build.gradle index a4a7ef7d..635e3e7c 100644 --- 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 diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 2c588460..65565b56 100644 --- 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 diff --git a/tutorials/java/Polygons/build.gradle b/tutorials/java/Polygons/build.gradle index a4a7ef7d..635e3e7c 100644 --- 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 diff --git a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties index 36e21048..26824092 100644 --- 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 diff --git a/tutorials/java/StyledMap/build.gradle b/tutorials/java/StyledMap/build.gradle index a4a7ef7d..635e3e7c 100644 --- 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 diff --git a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties index 22645beb..2239f130 100644 --- 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 diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle index aa75cc13..456e45cb 100644 --- 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" diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index e6e84c99..e7c8f3b5 100644 --- 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 diff --git a/tutorials/kotlin/MapWithMarker/build.gradle b/tutorials/kotlin/MapWithMarker/build.gradle index e42ce67e..2a656c4b 100644 --- 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" diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 94004235..8da4d3d8 100644 --- 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 diff --git a/tutorials/kotlin/Polygons/build.gradle b/tutorials/kotlin/Polygons/build.gradle index f13f5113..a1e20f71 100644 --- 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" diff --git a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties index 121eb4c6..f0c02bd8 100644 --- 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