Skip to content

Commit cb24b3b

Browse files
committed
use same version of kotlin reflect by updating squarepoet, update test case indent level
1 parent 9634b8f commit cb24b3b

22 files changed

+403
-403
lines changed

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ dependencies {
1111
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
1212

1313
implementation 'com.google.code.gson:gson:2.8.2'
14-
implementation 'com.squareup:kotlinpoet:0.6.0'
14+
implementation 'com.squareup:kotlinpoet:0.7.0'
1515
}
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import kotlin.String
22

33
data class EmptyTransitiveExample(
4-
val firstField: FirstField,
5-
val secondField: SecondField,
6-
val thirdField: ThirdField
4+
val firstField: FirstField,
5+
val secondField: SecondField,
6+
val thirdField: ThirdField
77
)
88

99
data class FirstField(
10-
val a: String,
11-
val b: String,
12-
val c: String,
13-
val d: String,
14-
val e: String,
15-
val f: String
10+
val a: String,
11+
val b: String,
12+
val c: String,
13+
val d: String,
14+
val e: String,
15+
val f: String
1616
)
1717

1818
data class SecondField(
19-
val g: String,
20-
val h: String,
21-
val i: String,
22-
val j: String,
23-
val k: String,
24-
val l: String
19+
val g: String,
20+
val h: String,
21+
val i: String,
22+
val j: String,
23+
val k: String,
24+
val l: String
2525
)
2626

2727
class ThirdField

core/src/test/resources/valid/commonality/edgecases/GroupExample.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import kotlin.String
33
data class GroupExample(val firstField: FirstField, val secondField: FirstField)
44

55
data class FirstField(
6-
val _0: String?,
7-
val _1: String?,
8-
val _2: String?,
9-
val _3: String?,
10-
val _4: String?,
11-
val _5: String,
12-
val _6: String,
13-
val _7: String?,
14-
val _8: String?,
15-
val _9: String?
6+
val _0: String?,
7+
val _1: String?,
8+
val _2: String?,
9+
val _3: String?,
10+
val _4: String?,
11+
val _5: String,
12+
val _6: String,
13+
val _7: String?,
14+
val _8: String?,
15+
val _9: String?
1616
)

core/src/test/resources/valid/commonality/edgecases/NestedAryObjectExample.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ data class NestedAryObjectExample(val nestedAryObjectExampleArray: Array<NestedA
77
data class NestedAryObjectExampleArray(val cachedContents: CachedContents?, val id: Number)
88

99
data class CachedContents(
10-
val average: String?,
11-
val largest: String,
12-
val top: Array<Top>?
10+
val average: String?,
11+
val largest: String,
12+
val top: Array<Top>?
1313
)
1414

1515
data class Top(val count: Number, val item: String)

core/src/test/resources/valid/commonality/edgecases/NestedObjObjExample.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ data class NestedObjObjExample(val nestedObjObjExampleArray: Array<NestedObjObjE
99
data class NestedObjObjExampleArray(val container: Container?, val format: Container)
1010

1111
data class Container(
12-
@SerializedName(value="null")
13-
val `null`: Number?,
14-
val align: String?,
15-
val bar: String?,
16-
val cat: Number?,
17-
val dog: Number?,
18-
val foo: Number?,
19-
val largest: Any?,
20-
val noCommas: String?,
21-
val non_null: Number?,
22-
val precisionStyle: String?,
23-
val smallest: Any?,
24-
val top: Array<Top>?,
25-
val view: String?,
26-
val whistle: String?
12+
@SerializedName(value="null")
13+
val `null`: Number?,
14+
val align: String?,
15+
val bar: String?,
16+
val cat: Number?,
17+
val dog: Number?,
18+
val foo: Number?,
19+
val largest: Any?,
20+
val noCommas: String?,
21+
val non_null: Number?,
22+
val precisionStyle: String?,
23+
val smallest: Any?,
24+
val top: Array<Top>?,
25+
val view: String?,
26+
val whistle: String?
2727
)
2828

2929
data class Largest(val latitude: String, val longitude: String)

core/src/test/resources/valid/commonality/edgecases/NoGroupExample.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import kotlin.String
33
data class NoGroupExample(val firstField: FirstField, val secondField: SecondField)
44

55
data class FirstField(
6-
val _1: String,
7-
val _2: String,
8-
val _3: String,
9-
val _4: String,
10-
val _5: String,
11-
val _6: String
6+
val _1: String,
7+
val _2: String,
8+
val _3: String,
9+
val _4: String,
10+
val _5: String,
11+
val _6: String
1212
)
1313

1414
data class SecondField(
15-
val _6: String,
16-
val _7: String,
17-
val _8: String,
18-
val _9: String,
19-
val _A: String,
20-
val _B: String
15+
val _6: String,
16+
val _7: String,
17+
val _8: String,
18+
val _9: String,
19+
val _A: String,
20+
val _B: String
2121
)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import kotlin.Any
22

33
data class NullableAnyExample(
4-
val firstField: FirstField,
5-
val secondField: FirstField,
6-
val thirdField: FirstField
4+
val firstField: FirstField,
5+
val secondField: FirstField,
6+
val thirdField: FirstField
77
)
88

99
data class FirstField(val foo: Any?)

core/src/test/resources/valid/commonality/obj/NullableObjExample.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import kotlin.Boolean
22
import kotlin.String
33

44
data class NullableObjExample(
5-
val firstField: FirstField,
6-
val fourthField: FirstField,
7-
val secondField: FirstField,
8-
val thirdField: FirstField
5+
val firstField: FirstField,
6+
val fourthField: FirstField,
7+
val secondField: FirstField,
8+
val thirdField: FirstField
99
)
1010

1111
data class FirstField(val foo: Foo?)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import kotlin.String
22

33
data class TransientStrExample(
4-
val firstField: FirstField,
5-
val secondField: FirstField,
6-
val thirdField: FirstField
4+
val firstField: FirstField,
5+
val secondField: FirstField,
6+
val thirdField: FirstField
77
)
88

99
data class FirstField(val bar: String?, val foo: String?)

core/src/test/resources/valid/namegen/KeywordsExample.kt

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,62 @@ import com.google.gson.annotations.SerializedName
22
import kotlin.String
33

44
data class KeywordsExample(
5-
@SerializedName(value="!in")
6-
val `!in`: String,
7-
@SerializedName(value="!is")
8-
val `!is`: String,
9-
@SerializedName(value="as?")
10-
val `as?`: String,
11-
@SerializedName(value="as")
12-
val `as`: String,
13-
@SerializedName(value="break")
14-
val `break`: String,
15-
@SerializedName(value="class")
16-
val `class`: String,
17-
@SerializedName(value="continue")
18-
val `continue`: String,
19-
@SerializedName(value="do")
20-
val `do`: String,
21-
@SerializedName(value="else")
22-
val `else`: String,
23-
@SerializedName(value="false")
24-
val `false`: String,
25-
@SerializedName(value="for")
26-
val `for`: String,
27-
@SerializedName(value="fun")
28-
val `fun`: String,
29-
@SerializedName(value="if")
30-
val `if`: String,
31-
@SerializedName(value="in")
32-
val `in`: String,
33-
@SerializedName(value="interface")
34-
val `interface`: String,
35-
@SerializedName(value="is")
36-
val `is`: String,
37-
@SerializedName(value="null")
38-
val `null`: String,
39-
@SerializedName(value="object")
40-
val `object`: String,
41-
@SerializedName(value="package")
42-
val `package`: String,
43-
@SerializedName(value="return")
44-
val `return`: String,
45-
@SerializedName(value="super")
46-
val `super`: String,
47-
@SerializedName(value="this")
48-
val `this`: String,
49-
@SerializedName(value="throw")
50-
val `throw`: String,
51-
@SerializedName(value="try")
52-
val `try`: String,
53-
@SerializedName(value="typealias")
54-
val `typealias`: String,
55-
@SerializedName(value="val")
56-
val `val`: String,
57-
@SerializedName(value="var")
58-
val `var`: String,
59-
@SerializedName(value="when")
60-
val `when`: String,
61-
@SerializedName(value="while")
62-
val `while`: String
5+
@SerializedName(value="!in")
6+
val `!in`: String,
7+
@SerializedName(value="!is")
8+
val `!is`: String,
9+
@SerializedName(value="as?")
10+
val `as?`: String,
11+
@SerializedName(value="as")
12+
val `as`: String,
13+
@SerializedName(value="break")
14+
val `break`: String,
15+
@SerializedName(value="class")
16+
val `class`: String,
17+
@SerializedName(value="continue")
18+
val `continue`: String,
19+
@SerializedName(value="do")
20+
val `do`: String,
21+
@SerializedName(value="else")
22+
val `else`: String,
23+
@SerializedName(value="false")
24+
val `false`: String,
25+
@SerializedName(value="for")
26+
val `for`: String,
27+
@SerializedName(value="fun")
28+
val `fun`: String,
29+
@SerializedName(value="if")
30+
val `if`: String,
31+
@SerializedName(value="in")
32+
val `in`: String,
33+
@SerializedName(value="interface")
34+
val `interface`: String,
35+
@SerializedName(value="is")
36+
val `is`: String,
37+
@SerializedName(value="null")
38+
val `null`: String,
39+
@SerializedName(value="object")
40+
val `object`: String,
41+
@SerializedName(value="package")
42+
val `package`: String,
43+
@SerializedName(value="return")
44+
val `return`: String,
45+
@SerializedName(value="super")
46+
val `super`: String,
47+
@SerializedName(value="this")
48+
val `this`: String,
49+
@SerializedName(value="throw")
50+
val `throw`: String,
51+
@SerializedName(value="try")
52+
val `try`: String,
53+
@SerializedName(value="typealias")
54+
val `typealias`: String,
55+
@SerializedName(value="val")
56+
val `val`: String,
57+
@SerializedName(value="var")
58+
val `var`: String,
59+
@SerializedName(value="when")
60+
val `when`: String,
61+
@SerializedName(value="while")
62+
val `while`: String
6363
)

0 commit comments

Comments
 (0)