Merge pull request #15114 from jdaugherty/7.0.x

Centralizing Gradle Logic

Author: jdaugherty

.github/workflows/groovy-joint-workflow.yml

@@ -153,7 +153,8 @@ jobs:
           path: ~/.m2/repository
           key: cache-local-maven-${{ github.sha }}
       - name: "🪶 Add mavenLocal repository to build"
-        run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
+        run: |
+          sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' settings.gradle
       - name: 'Swap Groovy Version'
         run: |
           sed -i "/['\"]groovy\.version['\"][[:space:]]*:/c\'groovy.version':'${{ needs.build_groovy.outputs.groovyVersion }}'," dependencies.gradle

UPGRADE7.md

@@ -0,0 +1,18 @@
+<!--
+SPDX-License-Identifier: Apache-2.0
+
+Licensed 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.
+-->
+# build-logic
+The Grails project is structured into 3 separate composite builds. Composite builds make use of Gradle's `includeBuild` feature, which do not share Gradle plugins from `buildSrc`. This project exists to share internal Gradle plugins across all 3 separate builds.
+

build-logic/README.md

@@ -0,0 +1,84 @@
+/*
+ *  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.
+ */
+
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+apply {
+    from file('../dependencies.gradle')
+}
+
+repositories {
+    // mavenLocal()
+    mavenCentral()
+    gradlePluginPortal()
+    maven {
+        url = 'https://repository.apache.org/content/groups/snapshots'
+        content {
+            includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
+        }
+    }
+    maven {
+        url = 'https://central.sonatype.com/repository/maven-snapshots'
+        content {
+            includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
+        }
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
+    maven {
+        url = 'https://repository.apache.org/content/groups/staging'
+        content {
+            includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
+        }
+        mavenContent {
+            releasesOnly()
+        }
+    }
+}
+
+file('../gradle.properties').withInputStream {
+    Properties props = new Properties()
+    props.load(it)
+    project.ext.gradleProperties = props
+}
+
+version = '0.0.1'
+group = 'org.apache.grails.buildsrc'
+
+dependencies {
+    implementation "${gradleBomDependencies['grails-publish-plugin']}"
+    implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${gradleProperties.gradleChecksumPluginVersion}"
+    implementation "org.cyclonedx.bom:org.cyclonedx.bom.gradle.plugin:${gradleProperties.gradleCycloneDxPluginVersion}"
+}
+
+gradlePlugin {
+    plugins {
+        publishPlugin {
+            id = 'org.apache.grails.buildsrc.publish'
+            implementationClass = 'org.apache.grails.buildsrc.PublishPlugin'
+        }
+        sbomPlugin {
+            id = 'org.apache.grails.buildsrc.sbom'
+            implementationClass = 'org.apache.grails.buildsrc.SbomPlugin'
+        }
+    }
+}

build-logic/build.gradle

@@ -0,0 +1,18 @@
+# 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
+#
+#     http://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.
+
+org.gradle.caching=true
+org.gradle.daemon=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M

build-logic/gradle.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists