Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/it1901/course-material.git

lectures/build.gradle

-plugins {
-    id 'org.asciidoctor.jvm.convert' version '3.3.2'
-    id 'org.asciidoctor.jvm.revealjs' version '3.3.2'
-}
-
-repositories {
-    jcenter()
-    maven {
-        url "https://plugins.gradle.org/m2/"
-    }
-    maven {
-    	url 'http://rubygems-proxy.torquebox.org/releases'
-    }
-}
-
-dependencies {
-    asciidoctorGems 'rubygems:asciidoctor-revealjs:4.1.0' // asciidoctorGems 'rubygems:asciidoctor-revealjs:2.0.0' 
-}
-
-asciidoctor {
-	sourceDir 'asciidoc'
-    sources {
-        include '*.adoc'
-    }
-    outputDir file('build/docs')
-	resources {
-		from('asciidoc') {
-	    	include '**/*.png'
-	 	}
-		into '.'
-	}
-    logDocuments = true
-
-    outputOptions {
-        backends 'html5'
-    }
-}
-
-asciidoctorj {
-    version = '2.4.3'
-	modules {
-       // diagram.use() 
-       diagram.version '1.5.16' 
-    }
-    // useIntermediateWorkDir = true
-    attributes toc: 'left', toclevels: 3,
-    	'source-highlighter': 'highlightjs'
-
-    /*	
-	extensions {
-        block_macro (name: 'tweet') { parent, target, attributes ->
-            String content = """<div class="tweet" data-src="https://twitter.com/${target}/status/${attributes.get('1')}"></div>"""
-            config.remove 'content_model'
-            createBlock(parent, "pass", [content], [:], config)
-        }
-    }
-    */	
-}
-
-asciidoctorRevealJs {
-
-    sourceDir 'revealjs'
-    sources {
-        include '*.adoc'
-    }
-    outputDir file('build/docs/slides')
-	resources {
-		from('revealjs') {
-	    	include 'images/**'
-	    	include '**/*.css'
-	 	}
-		into '.'
-	}
-
-    attributes 'sourceDir': 'revealjs',
-    	'imagesDir': 'revealjs',
-        'icons':'font',
-        'iconfont-name': 'fontawesome-4.5.0'
-
-    revealjsOptions {
-        controls = true
-        slideNumber = true
-        progressBar = true
-        pushToHistory = true
-        overviewMode = true
-        touchMode = true
-        backgroundTransition = 'convex' //none , fade, slide, convex, concave, zoom
-        theme = 'white' //'black', 'beige' , 'league', 'night', 'serif', 'simple', 'sky', 'solarized'
-    }
-
-	plugins 'rajgoel/chart/Chart.min.js'
-	//plugins 'IainAndrew/footer-reveal/footer-reveal.min.js'
-
-}
-
-revealjs {
-	version '2.0.0' //  why not '3.8.0' 
-	templateGitHub {
-   		organisation = 'hakimel'
-    	repository = 'reveal.js'
-    	tag = '3.8.0'
-  	}
-}
-
-revealjsPlugins {
-    github 'rajgoel', {
-        organisation = 'rajgoel'
-        repository = 'reveal.js-plugins'
-        branch = 'master'
-    }
-    
-    /*github 'IainAndrew', {
-        organisation = 'IainAndrew'
-        repository = 'footer-reveal'
-        branch = 'master'
-    }*/
-}
-
-build.dependsOn 'asciidoctor'
-build.dependsOn 'asciidoctorRevealJs'

pom.xml

@@ -11,6 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctorj.version>2.5.2</asciidoctorj.version>
+         <asciidoctorj.diagram.version>2.2.0</asciidoctorj.diagram.version>
         <jruby.version>9.2.9.0</jruby.version>
         <revealjs.version>3.9.2</revealjs.version>
         <!-- Use 'master' as version and remove the 'v' prefixing the download url to use the current snapshot version  -->
@@ -107,7 +108,30 @@
                         <artifactId>asciidoctorj</artifactId>
                         <version>${asciidoctorj.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-diagram</artifactId>
+                        <version>${asciidoctorj.diagram.version}</version>
+                    </dependency>
+                    <!-- Since asciidoctorj-diagram v2.2.0, uncomment to use specific version of plantuml or ditaa -->
+                    <!--
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-diagram-plantuml</artifactId>
+                        <version>1.2021.8</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-diagram-ditaamini</artifactId>
+                        <version>1.0.0</version>
+                    </dependency>
+                    -->
                 </dependencies>
+                <configuration>
+                    <requires>
+                        <require>asciidoctor-diagram</require>
+                    </requires>
+                </configuration>
                 <executions>
                     <execution>
                         <id>convert-to-html</id>