Skip to content

Commit 1de20d1

Browse files
samtsternsamtstern
authored
Automatic ktlint (#54)
1 parent f085cb4 commit 1de20d1

File tree

12 files changed

+118
-27
lines changed

12 files changed

+118
-27
lines changed

Diff for: ‎.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.{java,kt}]
2+
max_line_length = 120

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ android:
2121
- tools
2222
script:
2323
- python scripts/checksnippets.py
24-
- ./gradlew clean build
24+
- ./gradlew clean ktlint build

Diff for: ‎auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MainActivity.kt

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ import com.facebook.AccessToken
99
import com.google.android.gms.auth.api.signin.GoogleSignInAccount
1010
import com.google.android.gms.auth.api.signin.GoogleSignInOptions
1111
import com.google.firebase.FirebaseException
12-
import com.google.firebase.auth.*
12+
import com.google.firebase.auth.ActionCodeSettings
13+
import com.google.firebase.auth.AuthCredential
14+
import com.google.firebase.auth.EmailAuthProvider
15+
import com.google.firebase.auth.FacebookAuthProvider
16+
import com.google.firebase.auth.FirebaseAuth
17+
import com.google.firebase.auth.FirebaseUser
18+
import com.google.firebase.auth.GithubAuthProvider
19+
import com.google.firebase.auth.GoogleAuthProvider
20+
import com.google.firebase.auth.PhoneAuthCredential
21+
import com.google.firebase.auth.PhoneAuthProvider
22+
import com.google.firebase.auth.PlayGamesAuthProvider
23+
import com.google.firebase.auth.UserProfileChangeRequest
1324
import com.google.firebase.quickstart.auth.R
1425
import java.util.concurrent.TimeUnit
1526

Diff for: ‎build.gradle

+30-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.0-rc03'
10+
classpath 'com.android.tools.build:gradle:3.2.1'
1111
classpath 'com.google.gms:google-services:4.1.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
}
@@ -38,3 +38,32 @@ allprojects {
3838
}
3939
}
4040
}
41+
42+
configurations {
43+
ktlint
44+
}
45+
46+
dependencies {
47+
ktlint "com.github.shyiko:ktlint:0.29.0"
48+
}
49+
50+
task("ktlint", type: JavaExec, group: "verification") {
51+
def outputDir = "${project.buildDir}/reports/ktlint/"
52+
def inputFiles = project.fileTree(dir: "src", include: "**/*.kt")
53+
def outputFile = "${outputDir}ktlint-checkstyle-report.xml"
54+
55+
// See:
56+
// https://medium.com/@vanniktech/making-your-gradle-tasks-incremental-7f26e4ef09c3
57+
inputs.files(inputFiles)
58+
outputs.dir(outputDir)
59+
60+
description = "Check Kotlin code style."
61+
classpath = configurations.ktlint
62+
main = "com.github.shyiko.ktlint.Main"
63+
args = [
64+
"--android",
65+
"--reporter=plain",
66+
"--reporter=checkstyle,output=${outputFile}",
67+
"**/*.kt",
68+
]
69+
}

Diff for: ‎database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/QueryActivity.kt

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ package com.google.firebase.referencecode.database.kotlin
33
import android.os.Bundle
44
import android.support.v7.app.AppCompatActivity
55
import android.util.Log
6-
import com.google.firebase.database.*
6+
import com.google.firebase.database.ChildEventListener
7+
import com.google.firebase.database.DataSnapshot
8+
import com.google.firebase.database.DatabaseError
9+
import com.google.firebase.database.DatabaseReference
10+
import com.google.firebase.database.FirebaseDatabase
11+
import com.google.firebase.database.Query
12+
import com.google.firebase.database.ValueEventListener
713
import com.google.firebase.referencecode.database.R
814
import com.google.firebase.referencecode.database.models.Message
915

Diff for: ‎dynamic-links/app/src/main/java/com/google/firebase/quickstart/dynamiclinks/kotlin/MainActivity.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ abstract class MainActivity : AppCompatActivity() {
9090
fun shortenLongLink() {
9191
// [START shorten_long_link]
9292
val shortLinkTask = FirebaseDynamicLinks.getInstance().createDynamicLink()
93-
.setLongLink(Uri.parse("https://example.page.link/?link=https://www.example.com/&apn=com.example.android&ibn=com.example.ios"))
93+
.setLongLink(Uri.parse("https://example.page.link/?link=" +
94+
"https://www.example.com/&apn=com.example.android&ibn=com.example.ios"))
9495
.buildShortDynamicLink()
9596
.addOnCompleteListener { task ->
9697
if (task.isSuccessful) {

Diff for: ‎dynamic-links/app/src/main/java/com/google/firebase/quickstart/dynamiclinks/kotlin/ReferralActivity.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ abstract class ReferralActivity : AppCompatActivity() {
5050
val subject = String.format("%s wants you to play MyExampleGame!", referrerName)
5151
val invitationLink = mInvitationUrl.toString()
5252
val msg = "Let's play MyExampleGame together! Use my referrer link: $invitationLink"
53-
val msgHtml = String.format("<p>Let's play MyExampleGame together! Use my " + "<a href=\"%s\">referrer link</a>!</p>", invitationLink)
53+
val msgHtml = String.format("<p>Let's play MyExampleGame together! Use my " +
54+
"<a href=\"%s\">referrer link</a>!</p>", invitationLink)
5455

5556
val intent = Intent(Intent.ACTION_SENDTO)
5657
intent.data = Uri.parse("mailto:") // only email apps should handle this

Diff for: ‎firestore/app/src/main/java/com/google/example/firestore/kotlin/DocSnippets.kt

+45-11
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,29 @@ import android.support.annotation.WorkerThread
66
import android.util.Log
77
import com.google.android.gms.tasks.Task
88
import com.google.android.gms.tasks.Tasks
9-
import com.google.firebase.firestore.*
9+
import com.google.firebase.firestore.CollectionReference
10+
import com.google.firebase.firestore.DocumentChange
11+
import com.google.firebase.firestore.DocumentSnapshot
1012
import com.google.firebase.firestore.EventListener
11-
import java.util.*
12-
import java.util.concurrent.*
13+
import com.google.firebase.firestore.FieldPath
14+
import com.google.firebase.firestore.FieldValue
15+
import com.google.firebase.firestore.FirebaseFirestore
16+
import com.google.firebase.firestore.FirebaseFirestoreException
17+
import com.google.firebase.firestore.FirebaseFirestoreSettings
18+
import com.google.firebase.firestore.MetadataChanges
19+
import com.google.firebase.firestore.Query
20+
import com.google.firebase.firestore.QuerySnapshot
21+
import com.google.firebase.firestore.ServerTimestamp
22+
import com.google.firebase.firestore.SetOptions
23+
import com.google.firebase.firestore.Source
24+
import java.util.ArrayList
25+
import java.util.Date
26+
import java.util.HashMap
27+
import java.util.concurrent.Callable
28+
import java.util.concurrent.Executor
29+
import java.util.concurrent.LinkedBlockingQueue
30+
import java.util.concurrent.ThreadPoolExecutor
31+
import java.util.concurrent.TimeUnit
1332

1433
/**
1534
* Kotlin version of doc snippets.
@@ -106,8 +125,12 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
106125
// Add a new document with a generated ID
107126
db.collection("users")
108127
.add(user)
109-
.addOnSuccessListener { documentReference -> Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.id) }
110-
.addOnFailureListener { e -> Log.w(TAG, "Error adding document", e) }
128+
.addOnSuccessListener { documentReference ->
129+
Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.id)
130+
}
131+
.addOnFailureListener { e ->
132+
Log.w(TAG, "Error adding document", e)
133+
}
111134
// [END add_ada_lovelace]
112135
}
113136

@@ -123,8 +146,12 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
123146
// Add a new document with a generated ID
124147
db.collection("users")
125148
.add(user)
126-
.addOnSuccessListener { documentReference -> Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.id) }
127-
.addOnFailureListener { e -> Log.w(TAG, "Error adding document", e) }
149+
.addOnSuccessListener { documentReference ->
150+
Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.id)
151+
}
152+
.addOnFailureListener { e ->
153+
Log.w(TAG, "Error adding document", e)
154+
}
128155
// [END add_alan_turing]
129156
}
130157

@@ -265,8 +292,12 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
265292

266293
db.collection("cities")
267294
.add(data)
268-
.addOnSuccessListener { documentReference -> Log.d(TAG, "DocumentSnapshot written with ID: " + documentReference.id) }
269-
.addOnFailureListener { e -> Log.w(TAG, "Error adding document", e) }
295+
.addOnSuccessListener { documentReference ->
296+
Log.d(TAG, "DocumentSnapshot written with ID: " + documentReference.id)
297+
}
298+
.addOnFailureListener { e ->
299+
Log.w(TAG, "Error adding document", e)
300+
}
270301
// [END add_document]
271302
}
272303

@@ -447,7 +478,9 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
447478
fun customObjects() {
448479
// [START custom_objects]
449480
val docRef = db.collection("cities").document("BJ")
450-
docRef.get().addOnSuccessListener { documentSnapshot -> val city = documentSnapshot.toObject(City::class.java) }
481+
docRef.get().addOnSuccessListener { documentSnapshot ->
482+
val city = documentSnapshot.toObject(City::class.java)
483+
}
451484
// [END custom_objects]
452485
}
453486

@@ -738,7 +771,8 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
738771
val citiesRef = db.collection("cities")
739772

740773
// [START invalid_range_filters]
741-
citiesRef.whereGreaterThanOrEqualTo("state", "CA").whereGreaterThan("population", 100000)
774+
citiesRef.whereGreaterThanOrEqualTo("state", "CA")
775+
.whereGreaterThan("population", 100000)
742776
// [END invalid_range_filters]
743777
}
744778

Diff for: ‎messaging/app/src/main/java/com/google/firebase/example/messaging/kotlin/MainActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import org.json.JSONObject
1313
import java.io.IOException
1414
import java.net.HttpURLConnection
1515
import java.net.URL
16-
import java.util.*
17-
16+
import java.util.Scanner
1817
import java.util.concurrent.atomic.AtomicInteger
1918

2019
class MainActivity : AppCompatActivity() {
@@ -56,7 +55,8 @@ class MainActivity : AppCompatActivity() {
5655
val accountName = getAccount()
5756

5857
// Initialize the scope using the client ID you got from the Console.
59-
val scope = "audience:server:client_id:" + "1262xxx48712-9qs6n32447mcj9dirtnkyrejt82saa52.apps.googleusercontent.com"
58+
val scope = "audience:server:client_id:" +
59+
"1262xxx48712-9qs6n32447mcj9dirtnkyrejt82saa52.apps.googleusercontent.com"
6060

6161
var idToken: String? = null
6262
try {

Diff for: ‎predictions/app/src/main/java/com/google/firebase/example/predictions/kotlin/MainActivity.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import android.os.Bundle
44
import android.support.v7.app.AppCompatActivity
55
import android.view.View
66
import com.google.android.gms.ads.AdRequest
7-
import com.google.android.gms.ads.AdView
87
import com.google.firebase.analytics.FirebaseAnalytics
9-
import com.google.firebase.example.predictions.R
108
import com.google.firebase.remoteconfig.FirebaseRemoteConfig
11-
import kotlinx.android.synthetic.main.activity_main.*
9+
import kotlinx.android.synthetic.main.activity_main.adView
1210

1311
class MainActivity : AppCompatActivity() {
1412

Diff for: ‎storage/app/src/main/java/com/google/firebase/referencecode/storage/kotlin/StorageActivity.kt

+8-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ import com.google.android.gms.tasks.OnFailureListener
1010
import com.google.android.gms.tasks.Task
1111
import com.google.firebase.FirebaseApp
1212
import com.google.firebase.referencecode.storage.R
13-
import com.google.firebase.storage.*
14-
import kotlinx.android.synthetic.main.activity_storage.*
13+
import com.google.firebase.storage.FirebaseStorage
14+
import com.google.firebase.storage.StorageException
15+
import com.google.firebase.storage.StorageMetadata
16+
import com.google.firebase.storage.StorageReference
17+
import com.google.firebase.storage.UploadTask
18+
import kotlinx.android.synthetic.main.activity_storage.imageView
1519
import java.io.ByteArrayOutputStream
1620
import java.io.File
1721
import java.io.FileInputStream
@@ -273,7 +277,8 @@ abstract class StorageActivity : AppCompatActivity() {
273277

274278
// Create a reference from an HTTPS URL
275279
// Note that in the URL, characters are URL escaped!
276-
val httpsReference = storage.getReferenceFromUrl("https://firebasestorage.googleapis.com/b/bucket/o/images%20stars.jpg")
280+
val httpsReference = storage.getReferenceFromUrl(
281+
"https://firebasestorage.googleapis.com/b/bucket/o/images%20stars.jpg")
277282
// [END download_create_reference]
278283

279284
// [START download_to_memory]

Diff for: ‎tasks/app/src/main/java/com/google/firebase/quickstart/tasks/kotlin/MainActivity.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import com.google.firebase.auth.AuthResult
99
import com.google.firebase.auth.FirebaseAuth
1010
import com.google.firebase.auth.FirebaseAuthException
1111
import com.google.firebase.quickstart.tasks.R
12-
import java.util.concurrent.*
12+
import java.util.concurrent.ExecutionException
13+
import java.util.concurrent.LinkedBlockingQueue
14+
import java.util.concurrent.ThreadPoolExecutor
15+
import java.util.concurrent.TimeUnit
16+
import java.util.concurrent.TimeoutException
1317

1418
abstract class MainActivity : AppCompatActivity() {
1519

0 commit comments

Comments
 (0)