Skip to content

Commit db175ab

Browse files
authored
Merge pull request #14994 from matrei/update-features-and-templates
Update Feature info and Gradle templates
2 parents 18744d5 + 6aa0692 commit db175ab

36 files changed

+98
-72
lines changed

grails-forge/grails-forge-cli/src/test/groovy/org/grails/forge/cli/command/CreateAppCommandSpec.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ class CreateAppCommandSpec extends CommandSpec implements CommandFixture {
9696

9797
then:
9898
noExceptionThrown()
99-
baos.toString().contains("$previewFeature.name [PREVIEW]")
99+
previewFeature == null
100+
//baos.toString().contains("$previewFeature.name [PREVIEW]")
100101
communityFeature == null
101-
// baos.toString().contains("$communityFeature.name [COMMUNITY]")
102+
//baos.toString().contains("$communityFeature.name [COMMUNITY]")
102103

103104
cleanup:
104105
System.setOut(old)

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/Asciidoctor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public String getName() {
4646

4747
@Override
4848
public String getTitle() {
49-
return "Asciidoctor Documentation";
49+
return "AsciiDoc";
5050
}
5151

5252
@Override
5353
public String getDescription() {
54-
return "Adds support for creating Asciidoctor documentation";
54+
return "Add support for creating AsciiDoc documentation.";
5555
}
5656

5757
@Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ public String getName() {
5050

5151
@Override
5252
public String getTitle() {
53-
return "Asset Pipeline Core";
53+
return "Asset Pipeline";
5454
}
5555

5656
@NonNull
5757
@Override
5858
public String getDescription() {
59-
return "The Asset-Pipeline is a plugin used for managing and processing static assets in JVM applications primarily via Gradle (however not mandatory). Read more at https://github.com/bertramdev/asset-pipeline";
59+
return "Asset Pipeline is used for managing and processing static assets " +
60+
"(such as JavaScript, CSS and image files) in Grails applications. " +
61+
"Read more at https://github.com/wondrify/asset-pipeline.";
6062
}
6163

6264
@Override
@@ -118,10 +120,7 @@ public String getCategory() {
118120

119121
@Override
120122
public String getDocumentation() {
121-
return "https://github.com/bertramdev/asset-pipeline#readme";
122-
123-
// The site is currently offline (2024-11-28), replace the above when online again
124-
// return "https://www.asset-pipeline.com/manual/";
123+
return "https://github.com/wondrify/asset-pipeline#readme";
125124
}
126125

127126
@Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/GradleBuildSrc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public String getTitle() {
5252

5353
@Override
5454
public String getDescription() {
55-
return "Use Gradle buildSrc/build.gradle instead of buildscript{} in main build.gradle";
55+
return "Add a Gradle buildSrc/build.gradle file instead of the buildscript block in the main build.gradle.";
5656
}
5757

5858
@Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/GradleSettingsFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public String getTitle() {
5555

5656
@Override
5757
public String getDescription() {
58-
return "Generate Gradle Settings File for use in multi-project builds and with Gradle Settings Plugins";
58+
return "Add a Gradle settings file for multi-project builds or for applying settings plugins.";
5959
}
6060

6161
@Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ run {
115115
}
116116

117117
@if (features.contains("spock")) {
118-
tasks.withType(Test) {
118+
tasks.withType(Test).configureEach {
119119
useJUnitPlatform()
120120
@if (features.contains("geb")) {
121121
systemProperty "geb.env", System.getProperty('geb.env')

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/settingsGradle.rocker.raw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ Function<String, Coordinate> coordinateResolver,
3232
Features features)
3333

3434
@gradleBuild.renderSettingsExtensions()
35-
rootProject.name="@project.getName()"
35+
rootProject.name = "@project.getName()"

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/cache/EHCache.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ public String getName() {
3434

3535
@Override
3636
public String getTitle() {
37-
return "Grails EHCache Plugin";
37+
return "Ehcache Plugin";
3838
}
3939

4040
@Override
4141
public String getDescription() {
42-
return "The Grails Cache Ehcache plugin extends the Cache plugin and uses Ehcache as the storage provider for cached content.";
42+
return "The Grails Ehcache Plugin extends the Cache Plugin and uses Ehcache " +
43+
"as the storage provider for cached content.";
4344
}
4445

4546
@Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/cache/GrailsCache.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.grails.forge.build.dependencies.Dependency;
2525
import org.grails.forge.feature.Category;
2626
import org.grails.forge.feature.Feature;
27+
import org.grails.forge.util.VersionInfo;
2728

2829
import java.util.Map;
2930

@@ -37,12 +38,12 @@ public String getName() {
3738

3839
@Override
3940
public String getTitle() {
40-
return "Grails Cache Plugin";
41+
return "Cache";
4142
}
4243

4344
@Override
4445
public String getDescription() {
45-
return "The Grails Cache plugin provides powerful and easy to use caching functionality to Grails applications and plugins.";
46+
return "The Cache Plugin provides powerful and easy-to-use caching functionality for Grails applications and plugins.";
4647
}
4748

4849
@Override
@@ -69,7 +70,7 @@ public String getCategory() {
6970

7071
@Override
7172
public String getDocumentation() {
72-
return "https://docs.grails.org/";
73+
return "https://docs.grails.org/" + VersionInfo.getDocumentationVersion() + "/guide/cache.html";
7374
}
7475

7576
}

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/config/Properties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public String getTitle() {
4343

4444
@Override
4545
public String getDescription() {
46-
return "Creates a properties configuration file";
46+
return "Use Java properties for configuration instead of YAML.";
4747
}
4848

4949
@Override

0 commit comments

Comments
 (0)