Skip to content

Commit 49a9e82

Browse files
fix: update kotlin-editor for better parsing.
1 parent 76c81ca commit 49a9e82

File tree

2 files changed

+56
-13
lines changed

2 files changed

+56
-13
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dagp = "1.30.0"
44
java = "11"
55
junit5 = "5.7.2"
66
kotlin = "1.9.24"
7-
kotlinEditor = "0.6"
7+
kotlinEditor = "0.8"
88
mavenPublish = "0.28.0"
99
moshi = "1.14.0"
1010
retrofit = "2.9.0"

sort-dependencies-gradle-plugin/src/test/groovy/com/squareup/sort/FunctionalSpec.groovy

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ final class FunctionalSpec extends Specification {
5252
implementation(platform('com.squareup.okhttp3:okhttp-bom:4.10.0'))
5353
implementation('com.squareup.okhttp3:okhttp:4.10.0')
5454
implementation('com.squareup.okio:okio:3.2.0')
55-
}
56-
""".stripIndent()
55+
}""".stripIndent()
5756
}
5857

5958
def "can sort build.gradle"() {
@@ -80,8 +79,7 @@ final class FunctionalSpec extends Specification {
8079
implementation(platform('com.squareup.okhttp3:okhttp-bom:4.10.0'))
8180
implementation('com.squareup.okhttp3:okhttp:4.10.0')
8281
implementation('com.squareup.okio:okio:3.2.0')
83-
}
84-
""".stripIndent()
82+
}""".stripIndent()
8583
}
8684

8785
def "can sort build.gradle.kts"() {
@@ -108,8 +106,37 @@ final class FunctionalSpec extends Specification {
108106
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
109107
implementation("com.squareup.okhttp3:okhttp:4.10.0")
110108
implementation("com.squareup.okio:okio:3.2.0")
109+
}""".stripIndent()
110+
}
111+
112+
def "can sort build.gradle.kts with string property declaration"() {
113+
given: 'A build script with unsorted dependencies'
114+
def buildScript = dir.resolve('build.gradle.kts')
115+
Files.writeString(buildScript, BUILD_SCRIPT_KTS_STRING)
116+
117+
when: 'We sort dependencies'
118+
build(dir, 'sortDependencies')
119+
120+
then: 'Dependencies are sorted'
121+
buildScript.text == """\
122+
plugins {
123+
`java-library`
124+
id("com.squareup.sort-dependencies")
125+
}
126+
127+
repositories {
128+
mavenCentral()
129+
maven { url = uri("$REPO") }
111130
}
112-
""".stripIndent()
131+
132+
val okhttp3 = "com.squareup.okhttp3:okhttp:4.10.0"
133+
val okhttp3Bom = "com.squareup.okhttp3:okhttp-bom:4.10.0"
134+
135+
dependencies {
136+
implementation(platform(okhttp3Bom))
137+
implementation("com.squareup.okio:okio:3.2.0")
138+
implementation(okhttp3)
139+
}""".stripIndent()
113140
}
114141

115142
def "can check sort order"() {
@@ -149,8 +176,7 @@ final class FunctionalSpec extends Specification {
149176
'''
150177
sortDependencies {
151178
check false
152-
}
153-
'''.stripIndent(),
179+
}'''.stripIndent(),
154180
StandardOpenOption.APPEND
155181
)
156182

@@ -244,8 +270,7 @@ final class FunctionalSpec extends Specification {
244270
implementation('com.squareup.okio:okio:3.2.0')
245271
implementation('com.squareup.okhttp3:okhttp:4.10.0')
246272
implementation(platform('com.squareup.okhttp3:okhttp-bom:4.10.0'))
247-
}
248-
""".stripIndent()
273+
}""".stripIndent()
249274

250275
private String buildScriptWithVersion(String version) {
251276
"""\
@@ -267,8 +292,7 @@ final class FunctionalSpec extends Specification {
267292
implementation('com.squareup.okio:okio:3.2.0')
268293
implementation('com.squareup.okhttp3:okhttp:4.10.0')
269294
implementation(platform('com.squareup.okhttp3:okhttp-bom:4.10.0'))
270-
}
271-
""".stripIndent()
295+
}""".stripIndent()
272296
}
273297

274298
private static final BUILD_SCRIPT_KTS = """\
@@ -286,6 +310,25 @@ final class FunctionalSpec extends Specification {
286310
implementation("com.squareup.okio:okio:3.2.0")
287311
implementation("com.squareup.okhttp3:okhttp:4.10.0")
288312
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
313+
}""".stripIndent()
314+
315+
private static final BUILD_SCRIPT_KTS_STRING = """\
316+
plugins {
317+
`java-library`
318+
id("com.squareup.sort-dependencies")
319+
}
320+
321+
repositories {
322+
mavenCentral()
323+
maven { url = uri("$REPO") }
289324
}
290-
""".stripIndent()
325+
326+
val okhttp3 = "com.squareup.okhttp3:okhttp:4.10.0"
327+
val okhttp3Bom = "com.squareup.okhttp3:okhttp-bom:4.10.0"
328+
329+
dependencies {
330+
implementation("com.squareup.okio:okio:3.2.0")
331+
implementation(okhttp3)
332+
implementation(platform(okhttp3Bom))
333+
}""".stripIndent()
291334
}

0 commit comments

Comments
 (0)