jamesfredley commented on code in PR #16178:
URL: https://github.com/apache/grails-core/pull/16178#discussion_r3919437451
##########
build-logic/docs-core/build.gradle:
##########
@@ -71,6 +71,10 @@ sourceSets {
}
}
+// docs-core does not apply org.apache.grails.buildsrc.compile. Keep the same
+// Grails 8 default (indy off) as CompilePlugin. See #15293.
+apply from: layout.projectDirectory.file('../../gradle/groovy-indy.gradle')
Review Comment:
Removed. docs-core is unpublished, so it now uses Gradle's Groovy default.
Indy is only forced off via CompilePlugin on published artifacts.
##########
build-logic/plugins/build.gradle:
##########
@@ -57,6 +57,10 @@ tasks.named('test') {
useJUnitPlatform()
}
+// This project compiles CompilePlugin itself, so it cannot apply that plugin.
+// Keep the same Grails 8 default (indy off) as CompilePlugin. See #15293.
Review Comment:
Removed. This unpublished build-logic module now uses Gradle's Groovy
default. Published artifacts still get indy-off from CompilePlugin.
##########
gradle/groovy-indy.gradle:
##########
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Grails 8 keeps invokedynamic off. Groovy 5's compiler default is indy=true,
Review Comment:
Deleted gradle/groovy-indy.gradle. CompilePlugin is the only place that sets
indy=false, and it is already applied to published artifacts.
##########
grails-forge/build.gradle:
##########
@@ -83,6 +83,8 @@ allprojects {
}
subprojects {
+ apply from:
rootProject.layout.projectDirectory.file('../gradle/groovy-indy.gradle')
Review Comment:
Dropped the groovy-indy.gradle apply. Published forge modules already apply
CompilePlugin; unpublished ones keep Gradle's default.
##########
grails-gradle/build.gradle:
##########
@@ -72,6 +72,8 @@ final class ActiveProcessorCountArgumentProvider implements
CommandLineArgumentP
}
subprojects {
+ apply from:
rootProject.layout.projectDirectory.file('../gradle/groovy-indy.gradle')
Review Comment:
Removed the groovy-indy.gradle apply from subprojects. Published
grails-gradle modules already apply CompilePlugin via composition.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
