fix(deps): adjust dependencies required for grails 7

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

@@ -60,10 +60,6 @@ public String getDescription() {
 
  @Override
  public void apply(GeneratorContext generatorContext) {
- generatorContext.addBuildscriptDependency(Dependency.builder()
- .groupId("com.bertramlabs.plugins")
- .lookupArtifactId("asset-pipeline-gradle")
- .buildscript());
  generatorContext.addBuildPlugin(GradlePlugin.builder()
  .id("com.bertramlabs.asset-pipeline")
  .extension(new RockerWritable(assetPipelineExtension.template(generatorContext.getApplicationType())))

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

@@ -19,13 +19,18 @@ GradleBuild gradleBuild
 )
 
 @seleniumVersion => { @coordinateResolver.apply("selenium-api").getVersion() }
+@assetPipelineVersion => { @coordinateResolver.apply("asset-pipeline-grails").getVersion() }
 
 @for (String importLine : gradleBuild.getPluginsImports()) {
 @(importLine)
 }
 plugins {
 @for (GradlePlugin gradlePlugin : gradleBuild.getPlugins()) {
- id "@gradlePlugin.getId()"
+ @if(gradlePlugin.getId() == "com.bertramlabs.asset-pipeline") {
+ id "com.bertramlabs.asset-pipeline" version "@assetPipelineVersion"
+ } else {
+ id "@gradlePlugin.getId()"
+ }
 }
 }
 
@@ -38,6 +43,7 @@ apply from: "gradle/asciidoc.gradle"
 repositories {
  mavenCentral()
  maven { url "https://repo.grails.org/grails/core/" }
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
 configurations {
@@ -62,7 +68,9 @@ application {
 }
 
 java {
- sourceCompatibility = JavaVersion.toVersion("@features.getTargetJdk()")
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(@features.getTargetJdk())
+ }
 }
 
 @if (features.contains("jrebel")) {

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

@@ -37,9 +37,6 @@ pluginManagement {
  @if(features.contains("views-markup")) {
  id "org.grails.plugins.views-markup" version "@viewsGradlePluginVersion"
  }
- @if(features.contains("asset-pipeline-grails")) {
- id "com.bertramlabs.asset-pipeline" version "@assetPipelineVersion"
- }
 
  @for (GradlePlugin gradlePlugin : gradleBuild.getPluginsWithVersion()) {
  id "@gradlePlugin.getId()" version "@gradlePlugin.getVersion()"

grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java

@@ -103,6 +103,11 @@ public void apply(GeneratorContext generatorContext) {
  .compile());
  generatorContext.addBuildPlugin(GradlePlugin.builder().id("org.grails.grails-gsp").build());
 
+ generatorContext.addDependency(Dependency.builder()
+ .groupId("org.sitemesh")
+ .lookupArtifactId("grails-plugin-sitemesh3")
+ .compile());
+
  final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
  generatorContext.addTemplate("mainLayout", new URLTemplate(getViewFolderPath() + "layouts/main.gsp", classLoader.getResource("gsp/main.gsp")));
  generatorContext.addTemplate("index", new URLTemplate(getViewFolderPath() + "index.gsp", classLoader.getResource("gsp/index.gsp")));

grails-forge-core/src/main/resources/pom.xml

@@ -147,5 +147,10 @@
  <artifactId>micronaut-serde-jackson</artifactId>
  <version>2.11.0</version>
  </dependency>
+ <dependency>
+ <groupId>org.sitemesh</groupId>
+ <artifactId>grails-plugin-sitemesh3</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </dependency>
  </dependencies>
 </project>

grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy

@@ -45,7 +45,6 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("gradlePluginPortal()")
  settingsGradle.contains("id \"org.grails.grails-web\" version \"7.0.0-SNAPSHOT\"")
  settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
- settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 
  void "test settings.gradle for REST-API"() {
@@ -62,7 +61,6 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("id \"org.grails.grails-web\" version \"7.0.0-SNAPSHOT\"")
  settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"4.0.0-SNAPSHOT\"")
  !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
- !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 
  void "test settings.gradle for REST-API for markup-views"() {
@@ -80,6 +78,5 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"4.0.0-SNAPSHOT\"")
  !settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"4.0.0-SNAPSHOT\"")
  !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
- !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 }

grails-forge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy

@@ -20,18 +20,6 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF
  features.contains("asset-pipeline-grails")
  }
 
- void "test buildSrc is present for buildscript dependencies"() {
- given:
- final def output = generate(ApplicationType.WEB, new Options(TestFramework.SPOCK, JdkVersion.JDK_11))
- final def buildSrcBuildGradle = output["buildSrc/build.gradle"]
-
- expect:
- buildSrcBuildGradle != null
- buildSrcBuildGradle.contains("implementation(\"com.bertramlabs.plugins:asset-pipeline-gradle:5.0.1\")")
-
- }
-
-
  void "test dependencies are present for gradle"() {
  when:
  final String template = new BuildBuilder(beanContext)

grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy

@@ -33,6 +33,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
  template.contains("id \"org.grails.grails-web\"")
  template.contains("id \"org.grails.grails-gsp\"")
  template.contains("implementation(\"org.grails.plugins:gsp\")")
+ template.contains("implementation(\"org.sitemesh:grails-plugin-sitemesh3:7.0.0-SNAPSHOT\")")
  }
 
  void "test gsp configuration"() {
@@ -90,6 +91,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
  build.contains('id "org.grails.grails-web"')
  build.contains('id "org.grails.grails-gsp"')
  build.contains("implementation(\"org.grails.plugins:gsp\")")
+ build.contains("implementation(\"org.sitemesh:grails-plugin-sitemesh3:7.0.0-SNAPSHOT\")")
 
  where:
  applicationType << [ApplicationType.WEB, ApplicationType.WEB_PLUGIN]
@@ -104,6 +106,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
  then:
  !build.contains('id "org.grails.grails-gsp"')
  !build.contains("implementation(\"org.grails.plugins:gsp\")")
+ !build.contains("implementation(\"org.sitemesh:grails-plugin-sitemesh3:7.0.0-SNAPSHOT\")")
 
  where:
  applicationType << [ApplicationType.PLUGIN, ApplicationType.REST_API]