Fix the reCaptcha errors and aggregate query error (#27)

* Fix the reCaptcha errors and aggregate query error

Fixes Bug in Firestore count_aggregate_query snippets #24

and

Fixes Bug in phone_auth_web_with_recaptcha snippet #25

* upgrade kotlin, gradle, and java

* upgrade kotlin, gradle, and java

Author: nohe427

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       name: "Install Java"
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
 
     - name: "Install Flutter"
       run: |

packages/firebase_snippets_app/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
@@ -29,6 +29,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

packages/firebase_snippets_app/android/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-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

packages/firebase_snippets_app/lib/snippets/auth.dart

@@ -5,6 +5,7 @@ import 'dart:math';
 
 import 'package:crypto/crypto.dart';
 import 'package:firebase_auth/firebase_auth.dart';
+import 'package:firebase_auth_platform_interface/firebase_auth_platform_interface.dart';
 import 'package:firebase_snippets_app/snippets/snippet_base.dart';
 import 'package:flutter/foundation.dart';
 import 'package:google_sign_in/google_sign_in.dart';
@@ -576,6 +577,7 @@ class AuthenticationSnippets implements DocSnippet {
           await auth.signInWithPhoneNumber(
               '+44 7123 123 456',
               RecaptchaVerifier(
+                auth: FirebaseAuthPlatform.instance,
                 container: 'recaptcha',
                 size: RecaptchaVerifierSize.compact,
                 theme: RecaptchaVerifierTheme.dark,
@@ -584,6 +586,7 @@ class AuthenticationSnippets implements DocSnippet {
 
       // [START phone_auth_verify_recaptcha]
       RecaptchaVerifier(
+        auth: FirebaseAuthPlatform.instance,
         onSuccess: () => print('reCAPTCHA Completed!'),
         onError: (FirebaseAuthException error) => print(error),
         onExpired: () => print('reCAPTCHA Expired!'),

packages/firebase_snippets_app/lib/snippets/firestore.dart

@@ -824,8 +824,8 @@ class FirestoreSnippets extends DocSnippet {
   void aggregationQuery_count() {
     // [START count_aggregate_collection]
     // Returns number of documents in users collection
-    db.collection("users").count().then(
-          (res) => print(res.data().count),
+    db.collection("users").count().get().then(
+          (res) => print(res.count),
           onError: (e) => print("Error completing: $e"),
         );
     // [END count_aggregate_collection]
@@ -834,8 +834,8 @@ class FirestoreSnippets extends DocSnippet {
   void aggregationQuery_count2() {
     // [START count_aggregate_query]
     // This also works with collectionGroup queries.
-    db.collection("users").where("age", isGreaterThan: 10).count().then(
-          (res) => print(res.data().count),
+    db.collection("users").where("age", isGreaterThan: 10).count().get().then(
+          (res) => print(res.count),
           onError: (e) => print("Error completing: $e"),
         );
     // [END count_aggregate_query]