rename compile to implementation

jamesfredley · jamesfredley · commit a6903a170eac · 2024-11-11T17:51:43.000-05:00
diff --git a/grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Dependency.java b/grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Dependency.java
@@ -183,8 +183,8 @@ public Builder buildSrc() {
             return scope(Scope.BUILD);
         }
 
-        public Builder compile() {
-            return scope(Scope.COMPILE);
+        public Builder implementation() {
+            return scope(Scope.IMPLEMENTATION);
         }
 
         public Builder console() {
diff --git a/grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Scope.java b/grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Scope.java
@@ -26,7 +26,7 @@ public class Scope {
 
     public static final Scope ANNOTATION_PROCESSOR = new Scope(Source.MAIN, Collections.singletonList(Phase.ANNOTATION_PROCESSING));
     public static final Scope BUILD = new Scope(Source.BUILD_SRC, Arrays.asList(Phase.BUILD));
-    public static final Scope COMPILE = new Scope(Source.MAIN, Arrays.asList(Phase.COMPILATION, Phase.RUNTIME));
+    public static final Scope IMPLEMENTATION = new Scope(Source.MAIN, Arrays.asList(Phase.COMPILATION, Phase.RUNTIME));
     public static final Scope COMPILE_ONLY = new Scope(Source.MAIN, Collections.singletonList(Phase.COMPILATION));
     public static final Scope CONSOLE = new Scope(Source.MAIN, Collections.singletonList(Phase.CONSOLE));
     public static final Scope DEVELOPMENT_ONLY = new Scope(Source.MAIN, Collections.singletonList(Phase.DEVELOPMENT_ONLY));
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/cache/EHCache.java b/grails-forge-core/src/main/java/org/grails/forge/feature/cache/EHCache.java
@@ -47,7 +47,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .lookupArtifactId("cache-ehcache")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/cache/GrailsCache.java b/grails-forge-core/src/main/java/org/grails/forge/feature/cache/GrailsCache.java
@@ -51,7 +51,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .lookupArtifactId("cache")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java b/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java
@@ -86,7 +86,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("hibernate5")
-                .compile());
+                .implementation());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.apache.tomcat")
                 .artifactId("tomcat-jdbc")
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/database/MongoGorm.java b/grails-forge-core/src/main/java/org/grails/forge/feature/database/MongoGorm.java
@@ -68,7 +68,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("mongodb")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/database/MongoSync.java b/grails-forge-core/src/main/java/org/grails/forge/feature/database/MongoSync.java
@@ -52,7 +52,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.mongodb")
                 .lookupArtifactId("mongodb-driver-sync")
-                .compile()
+                .implementation()
         );
     }
 
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/database/Neo4jGorm.java b/grails-forge-core/src/main/java/org/grails/forge/feature/database/Neo4jGorm.java
@@ -53,7 +53,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("neo4j")
-                .compile());
+                .implementation());
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.neo4j.test")
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/grails/GrailsBase.java b/grails-forge-core/src/main/java/org/grails/forge/feature/grails/GrailsBase.java
@@ -54,15 +54,15 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-core")
-                .compile());
+                .implementation());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-web-boot")
-                .compile());
+                .implementation());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-logging")
-                .compile());
+                .implementation());
 
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         generatorContext.addTemplate("src/main/groovy", new URLTemplate("src/main/groovy/.gitkeep", classLoader.getResource(".gitkeep")));
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/grails/GrailsDefaultPlugins.java b/grails-forge-core/src/main/java/org/grails/forge/feature/grails/GrailsDefaultPlugins.java
@@ -57,7 +57,7 @@ public void apply(GeneratorContext generatorContext) {
                     generatorContext.addDependency(Dependency.builder()
                             .groupId("org.grails")
                             .artifactId("grails-plugin-" + artifact)
-                            .compile());
+                            .implementation());
                 });
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         generatorContext.addTemplate("messages_properties", new URLTemplate("grails-app/i18n/messages.properties", classLoader.getResource("i18n/messages.properties"), false));
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/logging/Logback.java b/grails-forge-core/src/main/java/org/grails/forge/feature/logging/Logback.java
@@ -67,7 +67,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-logging")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/logging/LogbackGroovy.java b/grails-forge-core/src/main/java/org/grails/forge/feature/logging/LogbackGroovy.java
@@ -64,13 +64,13 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-logging")
-                .compile());
+                .implementation());
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("io.github.virtualdogbert")
                 .artifactId("logback-groovy-config")
                 .version("1.12.4")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/migration/DatabaseMigrationPlugin.java b/grails-forge-core/src/main/java/org/grails/forge/feature/migration/DatabaseMigrationPlugin.java
@@ -59,7 +59,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .lookupArtifactId("database-migration")
-                .compile());
+                .implementation());
     }
 
     private String getSrcDirPath() {
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/other/GrailsQuartz.java b/grails-forge-core/src/main/java/org/grails/forge/feature/other/GrailsQuartz.java
@@ -48,7 +48,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .lookupArtifactId("quartz")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/other/HibernateValidator.java b/grails-forge-core/src/main/java/org/grails/forge/feature/other/HibernateValidator.java
@@ -50,7 +50,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.hibernate")
                 .lookupArtifactId("hibernate-validator")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/other/MicronautHttpClient.java b/grails-forge-core/src/main/java/org/grails/forge/feature/other/MicronautHttpClient.java
@@ -62,7 +62,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("io.micronaut")
                 .artifactId("micronaut-http-client")
-                .compile());
+                .implementation());
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("io.micronaut")
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootAutoconfigure.java b/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootAutoconfigure.java
@@ -53,7 +53,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-autoconfigure")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootJettyFeature.java b/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootJettyFeature.java
@@ -50,7 +50,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-starter-jetty")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootStarterFeature.java b/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootStarterFeature.java
@@ -55,19 +55,19 @@ public void apply(GeneratorContext generatorContext) {
             generatorContext.addDependency(Dependency.builder()
                     .groupId("org.springframework.boot")
                     .artifactId("spring-boot-starter")
-                    .compile());
+                    .implementation());
             generatorContext.addDependency(Dependency.builder()
                     .groupId("org.springframework.boot")
                     .artifactId("spring-boot-starter-actuator")
-                    .compile());
+                    .implementation());
         }
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-starter-validation")
-                .compile());
+                .implementation());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-starter-logging")
-                .compile());
+                .implementation());
     }
 }
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootTomcatFeature.java b/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootTomcatFeature.java
@@ -52,7 +52,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-starter-tomcat")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootUndertowFeature.java b/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootUndertowFeature.java
@@ -50,7 +50,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.springframework.boot")
                 .artifactId("spring-boot-starter-undertow")
-                .compile());
+                .implementation());
     }
 
     @Override
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java b/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
@@ -99,7 +99,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("gsp")
-                .compile());
+                .implementation());
 
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         generatorContext.addTemplate("mainLayout", new URLTemplate(getViewFolderPath() + "layouts/main.gsp", classLoader.getResource("gsp/main.gsp")));
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/view/Scaffolding.java b/grails-forge-core/src/main/java/org/grails/forge/feature/view/Scaffolding.java
@@ -87,6 +87,6 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("scaffolding")
-                .compile());
+                .implementation());
     }
 }
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/ViewJson.java b/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/ViewJson.java
@@ -85,11 +85,11 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("views-json")
-                .compile());
+                .implementation());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("views-json-templates")
-                .compile());
+                .implementation());
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/ViewMarkup.java b/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/ViewMarkup.java
@@ -81,7 +81,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("views-markup")
-                .compile());
+                .implementation());
 
         generatorContext.addTemplate("application_index_gml", new RockerTemplate(getViewFolderPath() + "application/index.gml", index.template()));
         generatorContext.addTemplate("_errors_gml", new RockerTemplate(getViewFolderPath() + "errors/_errors.gml", _errors.template()));
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy
@@ -13,13 +13,13 @@ class GradleDependencyComparatorSpec extends Specification {
             getTestFramework() >> TestFramework.JUNIT
         }
         List<GradleDependency> dependencies =
-                [dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-validation").compile(), ctx),
-                 dep(Dependency.builder().groupId("io.swagger.core.v3").artifactId("swagger-annotations").compile(), ctx),
-                 dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-runtime").compile(), ctx),
-                 dep(Dependency.builder().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").compile(), ctx),
-                 dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-http-client").compile(), ctx),
+                [dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-validation").implementation(), ctx),
+                 dep(Dependency.builder().groupId("io.swagger.core.v3").artifactId("swagger-annotations").implementation(), ctx),
+                 dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-runtime").implementation(), ctx),
+                 dep(Dependency.builder().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").implementation(), ctx),
+                 dep(Dependency.builder().groupId("io.micronaut").artifactId("micronaut-http-client").implementation(), ctx),
                  dep(Dependency.builder().groupId("io.micronaut.openapi").artifactId("micronaut-openapi").annotationProcessor(), ctx),
-                 dep(Dependency.builder().groupId("io.micronaut.sql").artifactId("micronaut-jdbc-hikari").compile(), ctx),
+                 dep(Dependency.builder().groupId("io.micronaut.sql").artifactId("micronaut-jdbc-hikari").implementation(), ctx),
                  dep(Dependency.builder().groupId("org.grails").artifactId("grails-console").console(), ctx),
                  dep(Dependency.builder().groupId("org.testcontainers").artifactId("testcontainers").testImplementation(), ctx),
                  dep(Dependency.builder().groupId("mysql").artifactId("mysql-connector-java").runtimeOnly(), ctx),

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ public Builder buildSrc() {`
`183`	`183`	`return scope(Scope.BUILD);`
`184`	`184`	`}`
`185`	`185`
`186`		`- public Builder compile() {`
`187`		`- return scope(Scope.COMPILE);`
	`186`	`+ public Builder implementation() {`
	`187`	`+ return scope(Scope.IMPLEMENTATION);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public Builder console() {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void apply(GeneratorContext generatorContext) {`
`47`	`47`	`generatorContext.addDependency(Dependency.builder()`
`48`	`48`	`.groupId("org.grails.plugins")`
`49`	`49`	`.lookupArtifactId("cache-ehcache")`
`50`		`- .compile());`
	`50`	`+ .implementation());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void apply(GeneratorContext generatorContext) {`
`51`	`51`	`generatorContext.addDependency(Dependency.builder()`
`52`	`52`	`.groupId("org.grails.plugins")`
`53`	`53`	`.lookupArtifactId("cache")`
`54`		`- .compile());`
	`54`	`+ .implementation());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void apply(GeneratorContext generatorContext) {`
`68`	`68`	`generatorContext.addDependency(Dependency.builder()`
`69`	`69`	`.groupId("org.grails.plugins")`
`70`	`70`	`.artifactId("mongodb")`
`71`		`- .compile());`
	`71`	`+ .implementation());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void apply(GeneratorContext generatorContext) {`
`52`	`52`	`generatorContext.addDependency(Dependency.builder()`
`53`	`53`	`.groupId("org.mongodb")`
`54`	`54`	`.lookupArtifactId("mongodb-driver-sync")`
`55`		`- .compile()`
	`55`	`+ .implementation()`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`