Merge branch 'master' into peterfriese/kotlin-let-it

peterfriese · web-flow · commit f8e78beed887 · 2023-02-02T21:18:51.000+01:00
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -26,12 +26,12 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.6.0'
-    implementation "com.google.firebase:firebase-ads:21.4.0"
+    implementation "com.google.firebase:firebase-ads:21.5.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.multidex:multidex:2.0.1"
 
     // [START gradle_play_config]
-    implementation 'com.google.android.gms:play-services-ads:21.4.0'
+    implementation 'com.google.android.gms:play-services-ads:21.5.0'
     // [END gradle_play_config]
 
     // For an optimal experience using AdMob, add the Firebase SDK
diff --git a/admob/build.gradle b/admob/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/analytics/app/src/main/java/com/google/firebase/example/analytics/kotlin/MainActivity.kt b/analytics/app/src/main/java/com/google/firebase/example/analytics/kotlin/MainActivity.kt
@@ -3,21 +3,21 @@ package com.google.firebase.example.analytics.kotlin
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.appcompat.app.AppCompatActivity
+import com.applovin.mediation.MaxAd
+import com.applovin.mediation.MaxAdRevenueListener
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.analytics.ktx.logEvent
 import com.google.firebase.example.analytics.R
 import com.google.firebase.ktx.Firebase
-// importing libraries to support 3rd party ad_impression snippets
-import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
 import com.ironsource.mediationsdk.impressionData.ImpressionData
-import com.applovin.mediation.MaxAd
-import com.applovin.mediation.MaxAdRevenueListener
-
+import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
 
-class MainActivity : AppCompatActivity(),
+class MainActivity :
+    AppCompatActivity(),
     // importing libraries to support 3rd party ad_impression snippets
-    MaxAdRevenueListener, ImpressionDataListener {
+    MaxAdRevenueListener,
+    ImpressionDataListener {
 
     // [START declare_analytics]
     private lateinit var firebaseAnalytics: FirebaseAnalytics
@@ -27,7 +27,6 @@ class MainActivity : AppCompatActivity(),
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-
         // [START shared_app_measurement]
         // Obtain the FirebaseAnalytics instance.
         firebaseAnalytics = Firebase.analytics
@@ -91,8 +90,10 @@ class MainActivity : AppCompatActivity(),
         firebaseAnalytics.logEvent(FirebaseAnalytics.Event.VIEW_ITEM_LIST) {
             param(FirebaseAnalytics.Param.ITEM_LIST_ID, "L001")
             param(FirebaseAnalytics.Param.ITEM_LIST_NAME, "Related products")
-            param(FirebaseAnalytics.Param.ITEMS,
-                    arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex))
+            param(
+                FirebaseAnalytics.Param.ITEMS,
+                arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex)
+            )
         }
         // [END view_item_list]
 
@@ -297,4 +298,4 @@ class MainActivity : AppCompatActivity(),
         }
     }
     // [END ad_impression_ironsource]
-}
+}
diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/appcheck/build.gradle b/appcheck/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:7.4.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.15'
 
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
@@ -52,7 +52,11 @@ configurations {
 }
 
 dependencies {
-    ktlint "com.github.shyiko:ktlint:0.31.0"
+    ktlint ("com.pinterest:ktlint:0.48.2") {
+        attributes {
+            attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
+        }
+    }
 }
 
 task("ktlint", type: JavaExec, group: "verification") {
@@ -67,7 +71,7 @@ task("ktlint", type: JavaExec, group: "verification") {
 
     description = "Check Kotlin code style."
     classpath = configurations.ktlint
-    main = "com.github.shyiko.ktlint.Main"
+    mainClass.set("com.pinterest.ktlint.Main")
     args = [
         "--format",
         "--android",
diff --git a/config/build.gradle b/config/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/crashlytics/build.gradle b/crashlytics/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
diff --git a/database/build.gradle b/database/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/dl-invites/build.gradle b/dl-invites/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/dynamic-links/build.gradle b/dynamic-links/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/firebaseoptions/build.gradle b/firebaseoptions/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/firestore/build.gradle b/firestore/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/functions/build.gradle b/functions/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/inappmessaging/build.gradle b/inappmessaging/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/installations/build.gradle b/installations/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:7.4.1"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
 
diff --git a/messaging/build.gradle b/messaging/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/ml-functions/build.gradle b/ml-functions/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/mlkit/build.gradle b/mlkit/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/perf/build.gradle b/perf/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/storage/build.gradle b/storage/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/tasks/app/src/main/java/com/google/firebase/quickstart/tasks/kotlin/MainActivity.kt b/tasks/app/src/main/java/com/google/firebase/quickstart/tasks/kotlin/MainActivity.kt
@@ -2,7 +2,6 @@ package com.google.firebase.quickstart.tasks.kotlin
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.google.android.gms.tasks.OnCompleteListener
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.tasks.Tasks
 import com.google.firebase.auth.AuthResult
@@ -82,9 +81,9 @@ abstract class MainActivity : AppCompatActivity() {
         // [END create_handler_and_executor]
 
         // [START tasks_run_task_executor]
-        task.addOnCompleteListener(executor, OnCompleteListener {
+        task.addOnCompleteListener(executor) {
             // ...
-        })
+        }
         // [END tasks_run_task_executor]
     }
 
diff --git a/tasks/build.gradle b/tasks/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }
diff --git a/test-lab/build.gradle b/test-lab/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.4.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.4.1'`
`10`	`10`	`classpath 'com.google.gms:google-services:4.3.15'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:7.4.0'`
	`10`	`+ classpath 'com.android.tools.build:gradle:7.4.1'`
`11`	`11`	`classpath 'com.google.gms:google-services:4.3.15'`
`12`	`12`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"`
`13`	`13`	`}`