Skip to content

Commit

Permalink
chore: Update project configurations and workflows (#902)
Browse files Browse the repository at this point in the history
- Update Javase reference link to point to version 17
- Update api docs directory to build/docs/api in grails-core and add a note regarding the change
- Change githubBranch to 7.0.x
- Update grailsVersion
- Modify Java CI workflow to skip snapshot for 7.0.x branch
  • Loading branch information
puneetbehl committed Apr 23, 2024
1 parent 5f6a937 commit cdce850
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ jobs:
SKIP_SNAPSHOT: ${{
startsWith(steps.extract_branch.outputs.value, '3.3') ||
startsWith(steps.extract_branch.outputs.value, '4.1') ||
startsWith(steps.extract_branch.outputs.value, '5.3')
startsWith(steps.extract_branch.outputs.value, '5.3') ||
startsWith(steps.extract_branch.outputs.value, '7.0')
}}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ archivesBaseName = "grails-docs"
ext.checkOutDir = project.layout.buildDirectory.dir('checkout').get().asFile.absolutePath
ext.outputDir = layout.buildDirectory.file("docs").get().asFile.absolutePath
ext.githubSlug = "grails/grails-doc"
ext.githubBranch = project.findProperty("githubBranch") ?: "6.2.x"
ext.githubBranch = project.findProperty("githubBranch") ?: "7.0.x"
ext.guidePage = "/docs/guide/single.html"
ext.indexPage = "/docs/index.html"

Expand Down Expand Up @@ -149,7 +149,7 @@ tasks.register('publishGuide', grails.doc.gradle.PublishGuide) {
asciidoc = true
properties = [
'javaee' : "https://docs.oracle.com/javaee/7/api/",
'javase' : "https://docs.oracle.com/en/java/javase/11/docs/api/",
'javase' : "https://docs.oracle.com/en/java/javase/17/docs/api/",
'groovyapi' : "https://docs.groovy-lang.org/${groovyVersion}/html/gapi/",
'springapi' : "https://docs.spring.io/spring/docs/${springVersion}/javadoc-api/",
'springdocs' : "https://docs.spring.io/spring/docs/${springVersion}/",
Expand Down Expand Up @@ -182,7 +182,7 @@ tasks.register("docs", Copy) {
dependsOn "apiDocs", "publishGuide", "createReleaseDropdown", "publishPdf"

def manualDocsDir = publishGuide.targetDir
def apiDocsDir = file(grailsHome + '/doc')
def apiDocsDir = file(grailsHome + '/build/docs') // This is the output directory of the groovydoc task in the grails project.
def modifiedPagesDir = createReleaseDropdown.outputDir
def mergedDocsDir = project.layout.buildDirectory.dir('docs')

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
grails.version=6.2.0
grails.version=7.0.0-SNAPSHOT
githubSlug=grails/grails-doc
githubBranch=6.2.x
githubBranch=7.0.x
springBootVersion=2.7.16
springVersion=5.3.33
gradleVersion=7.6.3
Expand Down

0 comments on commit cdce850

Please sign in to comment.