diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 26d8a98..2276bcb 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -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 diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml index df494bc..e568171 100644 --- a/.github/workflows/build_pr.yml +++ b/.github/workflows/build_pr.yml @@ -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 diff --git a/.github/workflows/build_releasecandidate.yml b/.github/workflows/build_releasecandidate.yml index e6d6511..56668b4 100644 --- a/.github/workflows/build_releasecandidate.yml +++ b/.github/workflows/build_releasecandidate.yml @@ -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 diff --git a/.github/workflows/update_pr_with_comment.yml b/.github/workflows/update_pr_with_comment.yml index 539e577..65fe110 100644 --- a/.github/workflows/update_pr_with_comment.yml +++ b/.github/workflows/update_pr_with_comment.yml @@ -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 diff --git a/.gitmodules b/.gitmodules index f80c461..15a8ee2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/build.gradle b/build.gradle index 9764091..8093968 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/docs/00b-basics/00-basics.adoc b/docs/00b-basics/00-basics.adoc index 79711f3..058dfce 100644 --- a/docs/00b-basics/00-basics.adoc +++ b/docs/00b-basics/00-basics.adoc @@ -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[] diff --git a/docs/01-module-block-1/references.adoc b/docs/01-module-block-1/references.adoc index 8fb3e41..40ceb2f 100644 --- a/docs/01-module-block-1/references.adoc +++ b/docs/01-module-block-1/references.adoc @@ -12,3 +12,10 @@ Eine Quelle wird über `\<