Skip to content

Commit

Permalink
Determine releaseBranch automatically based on version
Browse files Browse the repository at this point in the history
# Conflicts:
#	documentation/documentation.gradle.kts
  • Loading branch information
marcphilipp committed Apr 10, 2020
1 parent 11ddd87 commit 0be02cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
11 changes: 6 additions & 5 deletions documentation/documentation.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
`kotlin-library-conventions`
}

val modularProjects: List<Project> by rootProject.extra
val modularProjects: List<Project> by rootProject

// Because we need to set up Javadoc aggregation
modularProjects.forEach { evaluationDependsOn(it.path) }
Expand Down Expand Up @@ -50,6 +50,7 @@ asciidoctorj {

val snapshot = rootProject.version.toString().contains("SNAPSHOT")
val docsVersion = if (snapshot) "snapshot" else rootProject.version
val releaseBranch = if (snapshot) "master" else "r${rootProject.version}"
val docsDir = file("$buildDir/ghpages-docs")
val replaceCurrentDocs = project.hasProperty("replaceCurrentDocs")
val uploadPdfs = !snapshot
Expand Down Expand Up @@ -150,15 +151,15 @@ tasks {
attributes(mapOf(
"linkToPdf" to uploadPdfs,
"jupiter-version" to version,
"platform-version" to project.properties["platformVersion"],
"vintage-version" to project.properties["vintageVersion"],
"platform-version" to project.property("platformVersion"),
"vintage-version" to project.property("vintageVersion"),
"bom-version" to version,
"junit4-version" to Versions.junit4,
"apiguardian-version" to Versions.apiGuardian,
"ota4j-version" to Versions.ota4j,
"surefire-version" to Versions.surefire,
"release-branch" to project.properties["releaseBranch"],
"docs-version" to project.properties["docsVersion"],
"release-branch" to releaseBranch,
"docs-version" to docsVersion,
"revnumber" to version,
"consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
"experimentalApisTableFile" to experimentalApisTableFile,
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ vintageGroup = org.junit.vintage
vintageVersion = 5.6.2-SNAPSHOT

defaultBuiltBy = JUnit Team
releaseBranch = master

# We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
Expand Down

0 comments on commit 0be02cf

Please sign in to comment.