Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade build toolchain #160

Merged
merged 13 commits into from
Sep 24, 2024
2 changes: 1 addition & 1 deletion .github/workflows/build_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:

jobs:
call_workflow_build:
uses: isaqb-org/github-workflows/.github/workflows/build_main.yml@main
uses: isaqb-org/github-workflows/.github/workflows/build_main.yml@test
2 changes: 1 addition & 1 deletion .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:

jobs:
call_workflow_build_pr:
uses: isaqb-org/github-workflows/.github/workflows/build_pr.yml@main
uses: isaqb-org/github-workflows/.github/workflows/build_pr.yml@test
2 changes: 1 addition & 1 deletion .github/workflows/build_releasecandidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:

jobs:
call_workflow_build_pr:
uses: isaqb-org/github-workflows/.github/workflows/build_releasecandidate.yml@main
uses: isaqb-org/github-workflows/.github/workflows/build_releasecandidate.yml@test
2 changes: 1 addition & 1 deletion .github/workflows/update_pr_with_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
call_workflow_build:
uses: isaqb-org/github-workflows/.github/workflows/update_pr_with_comment.yml@main
uses: isaqb-org/github-workflows/.github/workflows/update_pr_with_comment.yml@test
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "license-copyright"]
path = license-copyright
url = https://github.com/isaqb-org/license-copyright
[submodule "gradle-tools"]
path = gradle-tools
url = https://github.com/isaqb-org/gradle-tools
46 changes: 4 additions & 42 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,44 +1,6 @@
import java.text.SimpleDateFormat

plugins {
id "java"
id "application"
}

def group = "org.isaqb"
def releaseVersion = System.getenv("RELEASE_VERSION")
def localVersion = "LocalBuild"
project.version = releaseVersion == null ? localVersion : releaseVersion
def curriculumFileName = "curriculum-template"
def versionDate = new SimpleDateFormat("yyyyMMdd").format(new Date())
def languages = ["DE", "EN"]

repositories {
mavenCentral()
}

dependencies {
implementation("org.asciidoctor:asciidoctorj:2.5.10")
implementation("org.asciidoctor:asciidoctorj-pdf:2.3.9")
}

application {
mainClass.set("org.isaqb.asciidoc.Main")
applicationDefaultJvmArgs = [
"""-DprojectVersion=${project.version}""",
"""-DcurriculumFileName=${curriculumFileName}""",
"""-DversionDate=${versionDate}""",
"""-Dlanguages=${languages.join(',')}""",
"""--add-opens""", """java.base/sun.nio.ch=ALL-UNNAMED""",
"""--add-opens""", """java.base/java.io=ALL-UNNAMED"""]
}

apply from: 'scripts/includeLearningObjectives.gradle'

tasks.register('buildDocs') {
description = 'Grouping task for generating all languages in several formats'
group = 'documentation'
dependsOn "includeLearningObjectives", "run"
ext {
curriculumFileName = "curriculum-template"
languages = ["DE", "EN"]
}

defaultTasks "buildDocs"
defaultTasks 'buildDocs'
7 changes: 7 additions & 0 deletions docs/00b-basics/00-basics.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ include::04-prerequisites-for-this-training.adoc[{include_configuration}]
include::05-curriculum-outline.adoc[{include_configuration}]

include::06-complementary-information.adoc[{include_configuration}]

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/01-module-block-1/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/02-module-block-2/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/03-module-block-3/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
8 changes: 8 additions & 0 deletions docs/04-module-block-4/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,11 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====


// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/05-module-block-5/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/20-examples/00-examples.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ include::01-examples-duration-terms.adoc[{include_configuration}]
include::02-learning-goals.adoc[{include_configuration}]

include::references.adoc[{include_configuration}]

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
7 changes: 7 additions & 0 deletions docs/20-examples/references.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ Eine Quelle wird über `\<<label>>` referenziert. Dieses muss in `99-references/

A reference source is referenced via `\<<label>>`. The label has to be defined in `99-references/00-references.adoc`.
====

// tag::DE[]
// silence asciidoctor warnings
// end::DE[]
// tag::EN[]
// silence asciidoctor warnings
// end::EN[]
4 changes: 0 additions & 4 deletions docs/99-references/00-references.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// header file for curriculum section "References"
// (c) iSAQB e.V. (https://isaqb.org)
// ===============================================

[bibliography]
== {references}

Expand Down
1 change: 1 addition & 0 deletions gradle-tools
Submodule gradle-tools added at 96b90b
Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 0 additions & 7 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading