Merge pull request #160 from isaqb-org/upgrade-build-toolchain

Upgrade build toolchain
isaqb-org · Sep 24, 2024 · 809dea0 · 809dea0
2 parents 6cfdd25 + 2bdd454
commit 809dea0
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 663 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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[]
diff --git a/docs/02-module-block-2/references.adoc b/docs/02-module-block-2/references.adoc
@@ -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[]
diff --git a/docs/03-module-block-3/references.adoc b/docs/03-module-block-3/references.adoc
@@ -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[]
diff --git a/docs/04-module-block-4/references.adoc b/docs/04-module-block-4/references.adoc
@@ -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[]
diff --git a/docs/05-module-block-5/references.adoc b/docs/05-module-block-5/references.adoc
@@ -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[]
diff --git a/docs/20-examples/00-examples.adoc b/docs/20-examples/00-examples.adoc
@@ -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[]
diff --git a/docs/20-examples/references.adoc b/docs/20-examples/references.adoc
@@ -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[]
diff --git a/docs/99-references/00-references.adoc b/docs/99-references/00-references.adoc
@@ -1,7 +1,3 @@
-// header file for curriculum section "References"
-// (c) iSAQB e.V. (https://isaqb.org)
-// ===============================================
-
 [bibliography]
 == {references}
 

diff --git a/gradle-tools b/gradle-tools
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties