Skip to content

Commit 36f111c

Browse files
ZheSun88ZheSun88
committed
Update build.gradle
1 parent 4c1452e commit 36f111c

File tree

6 files changed

+43
-43
lines changed

6 files changed

+43
-43
lines changed

‎flow-plugins/flow-gradle-plugin/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ check.dependsOn functionalTest
143143
gradlePlugin {
144144
testSourceSets sourceSets.functionalTest
145145
plugins {
146-
vaadinPlugin {
146+
flowPlugin {
147147
id = 'com.vaadin.flow'
148-
implementationClass = 'com.vaadin.flow.gradle.VaadinPlugin'
148+
implementationClass = 'com.vaadin.flow.gradle.FlowPlugin'
149149
}
150150
}
151151
}
152152

153153
pluginBundle {
154154
website = 'https://vaadin.com/docs/latest/flow/guide/start/gradle'
155155
vcsUrl = 'https://github.com/vaadin/flow'
156-
description = 'Build Vaadin applications with Gradle. Please follow the link below to learn which Plugin version to use with particular Vaadin version. Vaadin recommends using the latest Vaadin LTS version.'
157-
tags = ['vaadin']
156+
description = 'Build Flow applications with Gradle. Please follow the link below to learn which Plugin version to use with particular Vaadin version. Vaadin recommends using the latest Vaadin LTS version.'
157+
tags = ['flow']
158158
plugins {
159-
vaadinPlugin {
160-
id = gradlePlugin.plugins.vaadinPlugin.id
161-
displayName = 'Vaadin Gradle Plugin'
159+
flowPlugin {
160+
id = gradlePlugin.plugins.flowPlugin.id
161+
displayName = 'Flow Gradle Plugin'
162162
}
163163
}
164164
mavenCoordinates {

‎flow-plugins/flow-gradle-plugin/src/functionalTest/kotlin/com/vaadin/gradle/MiscMultiModuleTest.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
3838
testProject.buildFile.writeText("""
3939
plugins {
4040
id 'java'
41-
id 'com.vaadin' apply false
41+
id 'com.vaadin.flow' apply false
4242
}
4343
allprojects {
4444
repositories {
@@ -52,7 +52,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
5252
}
5353
project(':web') {
5454
apply plugin: 'war'
55-
apply plugin: 'com.vaadin'
55+
apply plugin: 'com.vaadin.flow'
5656
5757
dependencies {
5858
implementation project(':lib')
@@ -82,7 +82,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
8282
testProject.buildFile.writeText("""
8383
plugins {
8484
id 'java'
85-
id 'com.vaadin' apply false
85+
id 'com.vaadin.flow' apply false
8686
}
8787
allprojects {
8888
repositories {
@@ -96,7 +96,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
9696
}
9797
project(':web') {
9898
apply plugin: 'war'
99-
apply plugin: 'com.vaadin'
99+
apply plugin: 'com.vaadin.flow'
100100
101101
dependencies {
102102
implementation project(':lib')
@@ -135,7 +135,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
135135
testProject.buildFile.writeText("""
136136
plugins {
137137
id 'java'
138-
id 'com.vaadin' apply false
138+
id 'com.vaadin.flow' apply false
139139
}
140140
allprojects {
141141
repositories {
@@ -153,7 +153,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
153153
val webBuildFile = Files.createFile(webFolder.toPath().resolve("build.gradle"))
154154
webBuildFile.writeText("""
155155
apply plugin: 'war'
156-
apply plugin: 'com.vaadin'
156+
apply plugin: 'com.vaadin.flow'
157157
158158
dependencies {
159159
implementation project(':lib')
@@ -186,7 +186,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
186186
testProject.buildFile.writeText("""
187187
plugins {
188188
id 'java'
189-
id 'com.vaadin' apply false
189+
id 'com.vaadin.flow' apply false
190190
}
191191
allprojects {
192192
repositories {
@@ -204,7 +204,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
204204
val webBuildFile = Files.createFile(webFolder.toPath().resolve("build.gradle"))
205205
webBuildFile.writeText("""
206206
apply plugin: 'war'
207-
apply plugin: 'com.vaadin'
207+
apply plugin: 'com.vaadin.flow'
208208
209209
dependencies {
210210
implementation project(':lib')
@@ -236,7 +236,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
236236
testProject.buildFile.writeText("""
237237
plugins {
238238
id 'java'
239-
id 'com.vaadin' apply false
239+
id 'com.vaadin.flow' apply false
240240
}
241241
allprojects {
242242
repositories {
@@ -258,7 +258,7 @@ class MiscMultiModuleTest : AbstractGradleTest() {
258258
val webBuildFile = Files.createFile(webFolder.toPath().resolve("build.gradle"))
259259
webBuildFile.writeText("""
260260
apply plugin: 'war'
261-
apply plugin: 'com.vaadin'
261+
apply plugin: 'com.vaadin.flow'
262262
263263
dependencies {
264264
implementation project(':lib')

‎flow-plugins/flow-gradle-plugin/src/functionalTest/kotlin/com/vaadin/gradle/MiscSingleModuleTest.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
3939
plugins {
4040
id 'war'
4141
id 'org.gretty' version '4.0.3'
42-
id("com.vaadin")
42+
id("com.vaadin.flow")
4343
}
4444
repositories {
4545
mavenLocal()
@@ -103,7 +103,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
103103
plugins {
104104
id 'war'
105105
id 'org.gretty' version '4.0.3'
106-
id("com.vaadin")
106+
id("com.vaadin.flow")
107107
}
108108
repositories {
109109
mavenLocal()
@@ -136,7 +136,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
136136
"""
137137
plugins {
138138
id 'java'
139-
id("com.vaadin")
139+
id("com.vaadin.flow")
140140
}
141141
repositories {
142142
mavenLocal()
@@ -185,7 +185,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
185185
"""
186186
plugins {
187187
id 'java'
188-
id("com.vaadin")
188+
id("com.vaadin.flow")
189189
}
190190
repositories {
191191
mavenLocal()
@@ -256,7 +256,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
256256
id 'org.springframework.boot' version '$springBootVersion'
257257
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
258258
id 'java'
259-
id("com.vaadin")
259+
id("com.vaadin.flow")
260260
}
261261
262262
repositories {
@@ -362,7 +362,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
362362
plugins {
363363
id 'war'
364364
id 'org.gretty' version '4.0.3'
365-
id("com.vaadin")
365+
id("com.vaadin.flow")
366366
}
367367
repositories {
368368
mavenLocal()
@@ -417,7 +417,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
417417
testProject.buildFile.writeText(
418418
"""
419419
plugins {
420-
id 'com.vaadin'
420+
id 'com.vaadin.flow'
421421
}
422422
repositories {
423423
mavenLocal()
@@ -438,7 +438,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
438438
testProject.buildFile.writeText("""
439439
plugins {
440440
id 'war'
441-
id 'com.vaadin'
441+
id 'com.vaadin.flow'
442442
}
443443
repositories {
444444
mavenLocal()
@@ -464,7 +464,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
464464
testProject.buildFile.writeText("""
465465
plugins {
466466
id 'war'
467-
id 'com.vaadin'
467+
id 'com.vaadin.flow'
468468
}
469469
repositories {
470470
mavenLocal()
@@ -492,7 +492,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
492492
"""
493493
plugins {
494494
id 'war'
495-
id 'com.vaadin'
495+
id 'com.vaadin.flow'
496496
}
497497
repositories {
498498
mavenLocal()
@@ -523,7 +523,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
523523
fun testIncludeExclude() {
524524
testProject.buildFile.writeText("""
525525
plugins {
526-
id 'com.vaadin'
526+
id 'com.vaadin.flow'
527527
}
528528
repositories {
529529
mavenLocal()
@@ -571,7 +571,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
571571
id 'java'
572572
id 'org.springframework.boot' version '3.3.4'
573573
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
574-
id("com.vaadin")
574+
id("com.vaadin.flow")
575575
}
576576
577577
repositories {
@@ -656,7 +656,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
656656
"""
657657
plugins {
658658
id 'java'
659-
id 'com.vaadin'
659+
id 'com.vaadin.flow'
660660
}
661661
repositories {
662662
mavenLocal()
@@ -683,7 +683,7 @@ class MiscSingleModuleTest : AbstractGradleTest() {
683683
"""
684684
plugins {
685685
id 'java'
686-
id 'com.vaadin'
686+
id 'com.vaadin.flow'
687687
}
688688
repositories {
689689
mavenLocal()

‎flow-plugins/flow-gradle-plugin/src/functionalTest/kotlin/com/vaadin/gradle/TestUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ object OsUtils {
213213
* Used to test the plugin. Contains helpful utility methods to manipulate folders
214214
* and files in the project.
215215
*/
216-
class TestProject(val gradleVersion: String = VaadinPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION) {
216+
class TestProject(val gradleVersion: String = FlowPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION) {
217217
/**
218218
* The project root dir.
219219
*/

‎flow-plugins/flow-gradle-plugin/src/functionalTest/kotlin/com/vaadin/gradle/VaadinSmokeTest.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
4242
testProject.buildFile.writeText("""
4343
plugins {
4444
id 'war'
45-
id 'com.vaadin'
45+
id 'com.vaadin.flow'
4646
}
4747
repositories {
4848
mavenLocal()
@@ -196,7 +196,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
196196
testProject.buildFile.writeText("""
197197
plugins {
198198
id 'war'
199-
id 'com.vaadin'
199+
id 'com.vaadin.flow'
200200
}
201201
repositories {
202202
mavenLocal()
@@ -227,7 +227,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
227227
testProject.buildFile.writeText("""
228228
plugins {
229229
id 'war'
230-
id 'com.vaadin'
230+
id 'com.vaadin.flow'
231231
}
232232
repositories {
233233
mavenLocal()
@@ -266,7 +266,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
266266
testProject.buildFile.writeText("""
267267
plugins {
268268
id 'war'
269-
id 'com.vaadin'
269+
id 'com.vaadin.flow'
270270
}
271271
repositories {
272272
mavenLocal()
@@ -310,7 +310,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
310310
testProject.buildFile.writeText("""
311311
plugins {
312312
id 'war'
313-
id 'com.vaadin'
313+
id 'com.vaadin.flow'
314314
}
315315
repositories {
316316
mavenLocal()
@@ -397,7 +397,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
397397
"""
398398
plugins {
399399
id 'war'
400-
id 'com.vaadin'
400+
id 'com.vaadin.flow'
401401
}
402402
repositories {
403403
mavenLocal()
@@ -464,7 +464,7 @@ class VaadinSmokeTest : AbstractGradleTest() {
464464
setup()
465465
}
466466

467-
for (supportedVersion in arrayOf(VaadinPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION, "8.8", "8.10") ) {
467+
for (supportedVersion in arrayOf(FlowPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION, "8.8", "8.10") ) {
468468
setupProjectForGradleVersion(supportedVersion)
469469
val result = testProject.build("vaadinClean")
470470
result.expectTaskSucceded("vaadinClean")
@@ -478,16 +478,16 @@ class VaadinSmokeTest : AbstractGradleTest() {
478478
result.output,
479479
Regex("Failed to process the entry 'META-INF/versions/(\\d+)/com/fasterxml/jackson/"),
480480
"Expecting plugin execution to fail for version ${unsupportedVersion} " +
481-
"as it is lower than the supported one (${VaadinPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION}) " +
481+
"as it is lower than the supported one (${FlowPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION}) " +
482482
"and it is incompatible with Jackson library used by Flow"
483483
)
484484
} else {
485485
assertContains(
486486
result.output,
487-
"requires Gradle ${VaadinPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION} or later",
487+
"requires Gradle ${FlowPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION} or later",
488488
true,
489489
"Expecting plugin execution to fail for version ${unsupportedVersion} " +
490-
"as it is lower than the supported one (${VaadinPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION})"
490+
"as it is lower than the supported one (${FlowPlugin.GRADLE_MINIMUM_SUPPORTED_VERSION})"
491491
)
492492
assertContains(
493493
result.output,

‎flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinPlugin.kt ‎flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/FlowPlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.gradle.util.GradleVersion
2626
* The main class of the Vaadin Gradle Plugin.
2727
* @author [email protected]
2828
*/
29-
public class VaadinPlugin : Plugin<Project> {
29+
public class FlowPlugin : Plugin<Project> {
3030
public companion object {
3131
public const val GRADLE_MINIMUM_SUPPORTED_VERSION: String = "8.7"
3232
}

0 commit comments

Comments
 (0)