Skip to content

Commit 5c220b2

Browse files
yongceyongce
committed
Upgrade spotless/ktlint and fix some issues
1 parent 07e4efd commit 5c220b2

File tree

31 files changed

+1067
-998
lines changed

31 files changed

+1067
-998
lines changed

‎.editorconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 4
7+
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
13+
[*.{kt,kts}]
14+
ktlint_code_style = android
15+
ktlint_ignore_back_ticked_identifier = true
16+
17+
ktlint_standard = enabled
18+
ktlint_standard_import-ordering = disabled
19+
ktlint_standard_argument-list-wrapping = disabled
20+
ktlint_standard_wrapping = disabled
21+
22+
max_line_length = off
23+
24+
[*.md]
25+
trim_trailing_whitespace = false

‎android_project_common.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ext {
7373
// debug
7474
'leakcanary' : "2.10",
7575
'stetho' : '1.6.0',
76-
'ktlint' : "0.41.0",
76+
'ktlint' : "0.48.0",
7777

7878
// serializing
7979
'gson' : '2.10.1',

‎archLintRules/src/main/java/me/ycdev/android/arch/lint/MyBroadcastHelperDetector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MyBroadcastHelperDetector : WrapperDetectorBase() {
2828
"MyBroadcastHelper",
2929
"BroadcastHelper should be used.",
3030
"Please use the wrapper class 'BroadcastHelper' to register broadcast receivers" +
31-
" and send broadcasts to avoid security issues.",
31+
" and send broadcasts to avoid security issues.",
3232
Category.CORRECTNESS, 5, Severity.ERROR,
3333
Implementation(MyBroadcastHelperDetector::class.java, Scope.JAVA_FILE_SCOPE)
3434
)

‎archLintRules/src/main/java/me/ycdev/android/arch/lint/base/WrapperDetectorBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class WrapperDetectorBase : Detector(), Detector.UastScanner {
2121
if (surroundingClass == null) {
2222
println(
2323
"Fatal error in WrapperDetectorBase! Failed to get surrounding" +
24-
" class \'" + node.uastParent + "\'"
24+
" class \'" + node.uastParent + "\'"
2525
)
2626
return
2727
}

‎archLintRules/src/test/java/me/ycdev/android/arch/lint/MyBaseActivityDetectorTest.kt

Lines changed: 246 additions & 246 deletions
Large diffs are not rendered by default.

‎archLintRules/src/test/java/me/ycdev/android/arch/lint/MyBroadcastHelperDetectorTest.kt

Lines changed: 259 additions & 259 deletions
Large diffs are not rendered by default.

‎archLintRules/src/test/java/me/ycdev/android/arch/lint/MyIntentHelperDetectorTest.kt

Lines changed: 113 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,54 @@ class MyIntentHelperDetectorTest {
1111
fun testIntentHelperLintCase_java() {
1212
val testFile = TestFiles.java(
1313
"" +
14-
"package me.ycdev.android.arch.demo.wrapper;\n" +
15-
"\n" +
16-
"import android.content.Intent;\n" +
17-
"import android.os.Bundle;\n" +
18-
"\n" +
19-
"import me.ycdev.android.lib.common.wrapper.IntentHelper;\n" +
20-
"\n" +
21-
"public class IntentHelperLintCase {\n" +
22-
" private static class Foo {\n" +
23-
" public void hasExtra() { // lint good\n" +
24-
" }\n" +
25-
"\n" +
26-
" public void getBundleExtra() { // lint good\n" +
27-
" }\n" +
28-
" }\n" +
29-
"\n" +
30-
" public static void hasExtra() { // lint good\n" +
31-
" new Foo().hasExtra();\n" +
32-
" }\n" +
33-
"\n" +
34-
" public static void getBundleExtra() { // lint good\n" +
35-
" new Foo().getBundleExtra();\n" +
36-
" }\n" +
37-
"\n" +
38-
" public static boolean hasExtraGood(Intent intent, String key) {\n" +
39-
" return IntentHelper.hasExtra(intent, key); // lint good\n" +
40-
" }\n" +
41-
"\n" +
42-
" public static boolean getBooleanExtraGood(Intent intent, String key, boolean defValue) {\n" +
43-
" return IntentHelper.getBooleanExtra(intent, key, defValue); // lint good\n" +
44-
" }\n" +
45-
"\n" +
46-
" public static Bundle getBundleExtraGood(Intent intent, String key) {\n" +
47-
" return IntentHelper.getBundleExtra(intent, key); // lint good\n" +
48-
" }\n" +
49-
"\n" +
50-
" public static boolean hasExtraBad(Intent intent, String key) {\n" +
51-
" return intent.hasExtra(key); // lint violation\n" +
52-
" }\n" +
53-
"\n" +
54-
" public static boolean getBooleanExtraBad(Intent intent, String key, boolean defValue) {\n" +
55-
" return intent.getBooleanExtra(key, defValue); // lint violation\n" +
56-
" }\n" +
57-
"\n" +
58-
" public static Bundle getBundleExtraBad(Intent intent, String key) {\n" +
59-
" return intent.getBundleExtra(key); // lint violation\n" +
60-
" }\n" +
61-
"}\n"
14+
"package me.ycdev.android.arch.demo.wrapper;\n" +
15+
"\n" +
16+
"import android.content.Intent;\n" +
17+
"import android.os.Bundle;\n" +
18+
"\n" +
19+
"import me.ycdev.android.lib.common.wrapper.IntentHelper;\n" +
20+
"\n" +
21+
"public class IntentHelperLintCase {\n" +
22+
" private static class Foo {\n" +
23+
" public void hasExtra() { // lint good\n" +
24+
" }\n" +
25+
"\n" +
26+
" public void getBundleExtra() { // lint good\n" +
27+
" }\n" +
28+
" }\n" +
29+
"\n" +
30+
" public static void hasExtra() { // lint good\n" +
31+
" new Foo().hasExtra();\n" +
32+
" }\n" +
33+
"\n" +
34+
" public static void getBundleExtra() { // lint good\n" +
35+
" new Foo().getBundleExtra();\n" +
36+
" }\n" +
37+
"\n" +
38+
" public static boolean hasExtraGood(Intent intent, String key) {\n" +
39+
" return IntentHelper.hasExtra(intent, key); // lint good\n" +
40+
" }\n" +
41+
"\n" +
42+
" public static boolean getBooleanExtraGood(Intent intent, String key, boolean defValue) {\n" +
43+
" return IntentHelper.getBooleanExtra(intent, key, defValue); // lint good\n" +
44+
" }\n" +
45+
"\n" +
46+
" public static Bundle getBundleExtraGood(Intent intent, String key) {\n" +
47+
" return IntentHelper.getBundleExtra(intent, key); // lint good\n" +
48+
" }\n" +
49+
"\n" +
50+
" public static boolean hasExtraBad(Intent intent, String key) {\n" +
51+
" return intent.hasExtra(key); // lint violation\n" +
52+
" }\n" +
53+
"\n" +
54+
" public static boolean getBooleanExtraBad(Intent intent, String key, boolean defValue) {\n" +
55+
" return intent.getBooleanExtra(key, defValue); // lint violation\n" +
56+
" }\n" +
57+
"\n" +
58+
" public static Bundle getBundleExtraBad(Intent intent, String key) {\n" +
59+
" return intent.getBundleExtra(key); // lint violation\n" +
60+
" }\n" +
61+
"}\n"
6262
)
6363
val testFiles = arrayOf<TestFile>(
6464
TestFileStubs.nonNull,
@@ -72,69 +72,69 @@ class MyIntentHelperDetectorTest {
7272
.run()
7373
.expect(
7474
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.java:38: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
75-
" return intent.hasExtra(key); // lint violation\n" +
76-
" ~~~~~~~~~~~~~~~~~~~~\n" +
77-
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.java:42: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
78-
" return intent.getBooleanExtra(key, defValue); // lint violation\n" +
79-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
80-
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.java:46: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
81-
" return intent.getBundleExtra(key); // lint violation\n" +
82-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
83-
"3 errors, 0 warnings\n"
75+
" return intent.hasExtra(key); // lint violation\n" +
76+
" ~~~~~~~~~~~~~~~~~~~~\n" +
77+
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.java:42: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
78+
" return intent.getBooleanExtra(key, defValue); // lint violation\n" +
79+
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
80+
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.java:46: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
81+
" return intent.getBundleExtra(key); // lint violation\n" +
82+
" ~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
83+
"3 errors, 0 warnings\n"
8484
)
8585
}
8686

8787
@Test
8888
fun testIntentHelperLintCase_kotlin() {
8989
val testFile = TestFiles.kotlin(
9090
"package me.ycdev.android.arch.demo.wrapper\n" +
91-
"\n" +
92-
"import android.content.Intent\n" +
93-
"import android.os.Bundle\n" +
94-
"\n" +
95-
"import me.ycdev.android.lib.common.wrapper.IntentHelper\n" +
96-
"\n" +
97-
"object IntentHelperLintCase {\n" +
98-
" private class Foo {\n" +
99-
" fun hasExtra() { // lint good\n" +
100-
" }\n" +
101-
"\n" +
102-
" fun getBundleExtra() { // lint good\n" +
103-
" }\n" +
104-
" }\n" +
105-
"\n" +
106-
" fun hasExtra() { // lint good\n" +
107-
" Foo().hasExtra()\n" +
108-
" }\n" +
109-
"\n" +
110-
" fun getBundleExtra() { // lint good\n" +
111-
" Foo().getBundleExtra()\n" +
112-
" }\n" +
113-
"\n" +
114-
" fun hasExtraGood(intent: Intent, key: String): Boolean {\n" +
115-
" return IntentHelper.hasExtra(intent, key) // lint good\n" +
116-
" }\n" +
117-
"\n" +
118-
" fun getBooleanExtraGood(intent: Intent, key: String, defValue: Boolean): Boolean {\n" +
119-
" return IntentHelper.getBooleanExtra(intent, key, defValue) // lint good\n" +
120-
" }\n" +
121-
"\n" +
122-
" fun getBundleExtraGood(intent: Intent, key: String): Bundle? {\n" +
123-
" return IntentHelper.getBundleExtra(intent, key) // lint good\n" +
124-
" }\n" +
125-
"\n" +
126-
" fun hasExtraBad(intent: Intent, key: String): Boolean {\n" +
127-
" return intent.hasExtra(key) // lint violation\n" +
128-
" }\n" +
129-
"\n" +
130-
" fun getBooleanExtraBad(intent: Intent, key: String, defValue: Boolean): Boolean {\n" +
131-
" return intent.getBooleanExtra(key, defValue) // lint violation\n" +
132-
" }\n" +
133-
"\n" +
134-
" fun getBundleExtraBad(intent: Intent, key: String): Bundle {\n" +
135-
" return intent.getBundleExtra(key) // lint violation\n" +
136-
" }\n" +
137-
"}\n"
91+
"\n" +
92+
"import android.content.Intent\n" +
93+
"import android.os.Bundle\n" +
94+
"\n" +
95+
"import me.ycdev.android.lib.common.wrapper.IntentHelper\n" +
96+
"\n" +
97+
"object IntentHelperLintCase {\n" +
98+
" private class Foo {\n" +
99+
" fun hasExtra() { // lint good\n" +
100+
" }\n" +
101+
"\n" +
102+
" fun getBundleExtra() { // lint good\n" +
103+
" }\n" +
104+
" }\n" +
105+
"\n" +
106+
" fun hasExtra() { // lint good\n" +
107+
" Foo().hasExtra()\n" +
108+
" }\n" +
109+
"\n" +
110+
" fun getBundleExtra() { // lint good\n" +
111+
" Foo().getBundleExtra()\n" +
112+
" }\n" +
113+
"\n" +
114+
" fun hasExtraGood(intent: Intent, key: String): Boolean {\n" +
115+
" return IntentHelper.hasExtra(intent, key) // lint good\n" +
116+
" }\n" +
117+
"\n" +
118+
" fun getBooleanExtraGood(intent: Intent, key: String, defValue: Boolean): Boolean {\n" +
119+
" return IntentHelper.getBooleanExtra(intent, key, defValue) // lint good\n" +
120+
" }\n" +
121+
"\n" +
122+
" fun getBundleExtraGood(intent: Intent, key: String): Bundle? {\n" +
123+
" return IntentHelper.getBundleExtra(intent, key) // lint good\n" +
124+
" }\n" +
125+
"\n" +
126+
" fun hasExtraBad(intent: Intent, key: String): Boolean {\n" +
127+
" return intent.hasExtra(key) // lint violation\n" +
128+
" }\n" +
129+
"\n" +
130+
" fun getBooleanExtraBad(intent: Intent, key: String, defValue: Boolean): Boolean {\n" +
131+
" return intent.getBooleanExtra(key, defValue) // lint violation\n" +
132+
" }\n" +
133+
"\n" +
134+
" fun getBundleExtraBad(intent: Intent, key: String): Bundle {\n" +
135+
" return intent.getBundleExtra(key) // lint violation\n" +
136+
" }\n" +
137+
"}\n"
138138
)
139139
val testFiles = arrayOf<TestFile>(
140140
TestFileStubs.nonNull,
@@ -148,15 +148,15 @@ class MyIntentHelperDetectorTest {
148148
.run()
149149
.expect(
150150
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.kt:38: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
151-
" return intent.hasExtra(key) // lint violation\n" +
152-
" ~~~~~~~~~~~~~~~~~~~~\n" +
153-
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.kt:42: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
154-
" return intent.getBooleanExtra(key, defValue) // lint violation\n" +
155-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
156-
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.kt:46: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
157-
" return intent.getBundleExtra(key) // lint violation\n" +
158-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
159-
"3 errors, 0 warnings"
151+
" return intent.hasExtra(key) // lint violation\n" +
152+
" ~~~~~~~~~~~~~~~~~~~~\n" +
153+
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.kt:42: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
154+
" return intent.getBooleanExtra(key, defValue) // lint violation\n" +
155+
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
156+
"src/me/ycdev/android/arch/demo/wrapper/IntentHelperLintCase.kt:46: Error: Please use the wrapper class 'IntentHelper'. [MyIntentHelper]\n" +
157+
" return intent.getBundleExtra(key) // lint violation\n" +
158+
" ~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
159+
"3 errors, 0 warnings"
160160
)
161161
}
162162
}

0 commit comments

Comments
 (0)