Merge 6.2.x into 7.0.x #441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ile optional features
when buildSrc feature is selected buildscript{} will not generate in main build.gradle file
…grails-forge into simplify-generated-build
…o features instead of manually being set in dependencies.rocker.raw remove dependencies.rocker.raw since it duplicates toSnippet() rename RUNTIME to RUNTIME_ONLY, TEST to TEST_IMPLEMENTATION and TEST_RUNTIME to TEST_RUNTIME_ONLY to reflect the actual Gradle scope
…e same as main build.gradle file
this is the only Gradle build dependency that is needed in buildSrc/build.gradle and not in buildscript{}
Simplify generated build
update to grails 6.2.2 and grails-gradle-plugin 6.2.3
Related: 5dfd78b
Temporary measure to get a successful release workflow with an already published version.
Disable macos-arm for Java 11
# Conflicts: # gradle.properties
Temporary measure to get a successful release workflow with an already published version.
Update to grails 6.2.3-SNAPSHOT and grails-gradle-plugin 6.2.4-SNAPSHOT
This reverts commit a431e5e.
This reverts commit 9d0866c.
Change to only prevent the deployment to Google Cloud Run. We still want to the snapshot workflow to run as it builds, tests, publishes to sonatype ossrh, and uploads the built artifacts in the workflow summary.
#434) Decouples the graalvm version used for compiling the grails-cli from the java version used in the projects it creates.
Remove Automatic Snapshot Deployment to GCR for older versions
# Conflicts: # .github/workflows/mavenCentral.yml # .github/workflows/release.yml # .github/workflows/sdkman.yml # .github/workflows/snapshot.yml # grails-cli/build.gradle # grails-cli/src/main/java/org/grails/forge/cli/util/GrailsVersionProvider.java # grails-cli/src/test/groovy/org/grails/forge/cli/command/ApplicationCommandSpec.groovy # settings.gradle
Merge 6.0.x into 6.1.x
# Conflicts: # .github/workflows/mavenCentral.yml # .github/workflows/release.yml # .github/workflows/sdkman.yml # .github/workflows/snapshot.yml # grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy # settings.gradle
Merge 6.1.x into 6.2.x
# Conflicts: # .github/workflows/mavenCentral.yml # .github/workflows/release.yml # .github/workflows/snapshot.yml # gradle.properties # grails-cli/src/test/groovy/org/grails/forge/cli/CommandSpec.groovy # grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Dependency.java # grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Scope.java # grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java # grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/Gradle.java # grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw # grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw # grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw # grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/settingsGradle.rocker.raw # grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautInjectGroovy.java # grails-forge-core/src/main/java/org/grails/forge/feature/other/MicronautHttpClient.java # grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java # grails-forge-core/src/main/java/org/grails/forge/feature/view/Scaffolding.java # grails-forge-core/src/main/resources/pom.xml # grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/asciidoctor/AsciidoctorSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsGradlePluginSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/lang/GrailsApplicationSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautInjectGroovySpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy # grails-forge-core/src/test/groovy/org/grails/forge/feature/view/ScaffoldingSpec.groovy # test-core/src/test/groovy/org/grails/forge/features/scaffolding/ScaffoldingSpec.groovy
jamesfredley
commented
Dec 9, 2024
| String platformPrefix = " "; | ||
| snippet += platformPrefix + "platform"; | ||
| snippet += "platform("; | ||
| } else if (gradleConfiguration == INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES) { |
There was a problem hiding this comment.
If we ever add another Gradle scope that requires () we will re-engineer this code at that time.
jdaugherty
reviewed
Dec 9, 2024
There was a problem hiding this comment.
Spot checking this, it looks okay on the JDK version change. @matrei did most of the merges so I'd prefer he approve this one.
matrei
approved these changes
Dec 9, 2024
Comment on lines
+30
to
+34
| } | ||
|
|
||
| // buildSrc tests fail occasionally without running clean first | ||
| build { | ||
| dependsOn clean |
There was a problem hiding this comment.
Where is this code coming from. I can't find it, neither in 6.2.x or 7.0.x.
There was a problem hiding this comment.
It is technically new code that resolved an issue seen during the merge. It can also occur on 6.2.x, so I will commit it over there and then update this PR before merging.
Comment on lines
89
to
+92
| generatorContext.addDependency(Dependency.builder() | ||
| .groupId("org.grails.plugins") | ||
| .artifactId("views-json-templates") | ||
| .compile()); | ||
| .implementation()); |
There was a problem hiding this comment.
I'm not sure the views-json-templates dependency should be included by default with the views-json feature.
I think the templates in view-json-templates might only be relevant when using MongoDB.
But that can be the topic for another PR.
run clean before build to work around buildSrc tests which fail
This was referenced Dec 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@matrei @jdaugherty I am confident in the changes coming over from #424 and their application to code that was not present on 6.2.x. This is the vast majority of this PR.
Since 6.2.x and 7.0.x branches had diverged significantly, please focus on your recent commits and verify that I chose correctly when addressing the merge conflicts and decided correctly for 7.0.x.