Skip to content

Commit f183b61

Browse files
authored
Bump Kotlin to 1.6.21 in integration tests
We can't use the latest version, due to the Gradle matrix limit in tests.
1 parent 4775485 commit f183b61

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
3030
void integrationDiktat() throws IOException {
3131
setFile("build.gradle").toLines(
3232
"plugins {",
33-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
33+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
3434
" id 'com.diffplug.spotless'",
3535
"}",
3636
"repositories { mavenCentral() }",
@@ -48,7 +48,7 @@ void integrationDiktat() throws IOException {
4848
void integrationKtfmt_dropboxStyle_0_19() throws IOException {
4949
setFile("build.gradle").toLines(
5050
"plugins {",
51-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
51+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
5252
" id 'com.diffplug.spotless'",
5353
"}",
5454
"repositories { mavenCentral() }",
@@ -66,7 +66,7 @@ void integrationKtfmt_dropboxStyle_0_19() throws IOException {
6666
void withExperimentalEditorConfigOverride() throws IOException {
6767
setFile("build.gradle").toLines(
6868
"plugins {",
69-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
69+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
7070
" id 'com.diffplug.spotless'",
7171
"}",
7272
"repositories { mavenCentral() }",
@@ -90,7 +90,7 @@ void testWithInvalidEditorConfigFile() throws IOException {
9090

9191
setFile("build.gradle").toLines(
9292
"plugins {",
93-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
93+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
9494
" id 'com.diffplug.spotless'",
9595
"}",
9696
"repositories { mavenCentral() }",
@@ -110,7 +110,7 @@ void testReadCodeStyleFromEditorConfigFile() throws IOException {
110110
setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
111111
setFile("build.gradle").toLines(
112112
"plugins {",
113-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
113+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
114114
" id 'com.diffplug.spotless'",
115115
"}",
116116
"repositories { mavenCentral() }",
@@ -127,7 +127,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
127127
setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
128128
setFile("build.gradle").toLines(
129129
"plugins {",
130-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
130+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
131131
" id 'com.diffplug.spotless'",
132132
"}",
133133
"repositories { mavenCentral() }",
@@ -145,7 +145,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
145145
void withCustomRuleSetApply() throws IOException {
146146
setFile("build.gradle").toLines(
147147
"plugins {",
148-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
148+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
149149
" id 'com.diffplug.spotless'",
150150
"}",
151151
"repositories { mavenCentral() }",
@@ -169,7 +169,7 @@ void withCustomRuleSetApply() throws IOException {
169169
void testWithHeader() throws IOException {
170170
setFile("build.gradle").toLines(
171171
"plugins {",
172-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
172+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
173173
" id 'com.diffplug.spotless'",
174174
"}",
175175
"repositories { mavenCentral() }",
@@ -188,7 +188,7 @@ void testWithHeader() throws IOException {
188188
void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
189189
setFile("build.gradle").toLines(
190190
"plugins {",
191-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
191+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
192192
" id 'com.diffplug.spotless'",
193193
"}",
194194
"repositories { mavenCentral() }",

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class KotlinGradleExtensionTest extends KotlinExtensionTest {
3030
void testTarget(boolean useDefaultTarget) throws IOException {
3131
setFile("build.gradle").toLines(
3232
"plugins {",
33-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
33+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
3434
" id 'com.diffplug.spotless'",
3535
"}",
3636
"repositories { mavenCentral() }",

0 commit comments

Comments
 (0)