Skip to content

Commit b266995

Browse files
authored
chore: update ktlint 0.31.0 --> 0.48.2 (#418)
* chore: update ktlint 0.31.0 --> 0.48.2 * ktlint autoformat * chore: remove comments from imports according to ktlint: > Imports must be ordered in lexicographic order without any empty lines in-between * Revert "ktlint autoformat" This reverts commit c815102 * fix tasks snippet
1 parent 3b2cb1a commit b266995

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

analytics/app/src/main/java/com/google/firebase/example/analytics/kotlin/MainActivity.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ package com.google.firebase.example.analytics.kotlin
33
import android.os.Bundle
44
import android.os.Parcelable
55
import androidx.appcompat.app.AppCompatActivity
6+
import com.applovin.mediation.MaxAd
7+
import com.applovin.mediation.MaxAdRevenueListener
68
import com.google.firebase.analytics.FirebaseAnalytics
79
import com.google.firebase.analytics.ktx.analytics
810
import com.google.firebase.analytics.ktx.logEvent
911
import com.google.firebase.example.analytics.R
1012
import com.google.firebase.ktx.Firebase
11-
// importing libraries to support 3rd party ad_impression snippets
12-
import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
1313
import com.ironsource.mediationsdk.impressionData.ImpressionData
14-
import com.applovin.mediation.MaxAd
15-
import com.applovin.mediation.MaxAdRevenueListener
16-
14+
import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
1715

18-
class MainActivity : AppCompatActivity(),
16+
class MainActivity :
17+
AppCompatActivity(),
1918
// importing libraries to support 3rd party ad_impression snippets
20-
MaxAdRevenueListener, ImpressionDataListener {
19+
MaxAdRevenueListener,
20+
ImpressionDataListener {
2121

2222
// [START declare_analytics]
2323
private lateinit var firebaseAnalytics: FirebaseAnalytics
@@ -27,7 +27,6 @@ class MainActivity : AppCompatActivity(),
2727
super.onCreate(savedInstanceState)
2828
setContentView(R.layout.activity_main)
2929

30-
3130
// [START shared_app_measurement]
3231
// Obtain the FirebaseAnalytics instance.
3332
firebaseAnalytics = Firebase.analytics
@@ -91,8 +90,10 @@ class MainActivity : AppCompatActivity(),
9190
firebaseAnalytics.logEvent(FirebaseAnalytics.Event.VIEW_ITEM_LIST) {
9291
param(FirebaseAnalytics.Param.ITEM_LIST_ID, "L001")
9392
param(FirebaseAnalytics.Param.ITEM_LIST_NAME, "Related products")
94-
param(FirebaseAnalytics.Param.ITEMS,
95-
arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex))
93+
param(
94+
FirebaseAnalytics.Param.ITEMS,
95+
arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex)
96+
)
9697
}
9798
// [END view_item_list]
9899

@@ -297,4 +298,4 @@ class MainActivity : AppCompatActivity(),
297298
}
298299
}
299300
// [END ad_impression_ironsource]
300-
}
301+
}

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ configurations {
5252
}
5353

5454
dependencies {
55-
ktlint "com.github.shyiko:ktlint:0.31.0"
55+
ktlint ("com.pinterest:ktlint:0.48.2") {
56+
attributes {
57+
attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
58+
}
59+
}
5660
}
5761

5862
task("ktlint", type: JavaExec, group: "verification") {
@@ -67,7 +71,7 @@ task("ktlint", type: JavaExec, group: "verification") {
6771

6872
description = "Check Kotlin code style."
6973
classpath = configurations.ktlint
70-
main = "com.github.shyiko.ktlint.Main"
74+
mainClass.set("com.pinterest.ktlint.Main")
7175
args = [
7276
"--format",
7377
"--android",

tasks/app/src/main/java/com/google/firebase/quickstart/tasks/kotlin/MainActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.google.firebase.quickstart.tasks.kotlin
22

33
import android.os.Bundle
44
import androidx.appcompat.app.AppCompatActivity
5-
import com.google.android.gms.tasks.OnCompleteListener
65
import com.google.android.gms.tasks.Task
76
import com.google.android.gms.tasks.Tasks
87
import com.google.firebase.auth.AuthResult
@@ -82,9 +81,9 @@ abstract class MainActivity : AppCompatActivity() {
8281
// [END create_handler_and_executor]
8382

8483
// [START tasks_run_task_executor]
85-
task.addOnCompleteListener(executor, OnCompleteListener {
84+
task.addOnCompleteListener(executor) {
8685
// ...
87-
})
86+
}
8887
// [END tasks_run_task_executor]
8988
}
9089

0 commit comments

Comments
 (0)