Skip to content

Commit 1e90cfc

Browse files
cjbrooks12cjbrooks12
committed
Updates dependency versions
1 parent 9c0fe5e commit 1e90cfc

File tree

12 files changed

+228
-13
lines changed

12 files changed

+228
-13
lines changed

‎OrchidCore/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ dependencies {
88

99
// Dynamic Component Registration
1010
api 'com.google.inject:guice:4.2.2'
11-
api 'io.github.classgraph:classgraph:4.4.12'
11+
api 'io.github.classgraph:classgraph:4.6.10'
1212

1313
// core utilities
1414
api "com.eden:Common:${JavaEden.Common}"
1515
api "com.eden:Clog4j:${JavaEden.Clog}"
1616
api "com.eden:krow:${JavaEden.Krow}"
17-
api "com.squareup.okhttp3:okhttp:3.12.0"
17+
api "com.squareup.okhttp3:okhttp:3.12.1"
1818
api "commons-io:commons-io:2.6"
1919
api 'org.apache.commons:commons-lang3:3.8.1'
2020
api 'net.coobird:thumbnailator:0.4.8'
@@ -26,7 +26,7 @@ dependencies {
2626
// validation
2727
api "javax.validation:validation-api:2.0.1.Final"
2828
implementation "org.hibernate.validator:hibernate-validator:6.0.13.Final"
29-
api "org.glassfish:javax.el:3.0.1-b10"
29+
implementation "org.glassfish:javax.el:3.0.1-b11"
3030

3131
// Included parsers: JSON, YAML, TOML, CSV, Pebble, Markdown, Sass
3232
api 'org.json:json:20180130'

‎OrchidCore/src/main/java/com/eden/orchid/impl/compilers/markdown/MarkdownCompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.eden.orchid.api.compilers.OrchidCompiler;
44
import com.vladsch.flexmark.Extension;
5-
import com.vladsch.flexmark.IRender;
65
import com.vladsch.flexmark.html.HtmlRenderer;
76
import com.vladsch.flexmark.parser.Parser;
7+
import com.vladsch.flexmark.util.IRender;
88
import com.vladsch.flexmark.util.options.MutableDataSet;
99

1010
import javax.inject.Inject;

‎OrchidCore/src/orchid/resources/changelog/0_15_2.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
version: '0.15.2'
3+
---
4+
5+
- Updates dependency versions

‎OrchidCore/src/test/java/com/eden/orchid/testhelpers/TestHomepageModule.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eden.orchid.testhelpers;
2+
3+
import com.eden.orchid.api.generators.OrchidGenerator;
4+
import com.eden.orchid.api.registration.OrchidModule;
5+
import com.eden.orchid.impl.generators.HomepageGenerator;
6+
7+
public class TestHomepageModule extends OrchidModule {
8+
9+
@Override
10+
protected void configure() {
11+
addToSet(OrchidGenerator.class, HomepageGenerator.class);
12+
}
13+
14+
}

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply from: 'gradle/dependencies.gradle'
44
apply from: 'gradle/utils.gradle'
55

66
buildscript {
7-
def kotlin_version = '1.3.10'
7+
def kotlin_version = '1.3.11'
88
repositories {
99
maven { url "https://plugins.gradle.org/m2/" }
1010
jcenter()

‎gradle/actions/kotlin.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@ compileKotlin {
44
kotlinOptions {
55
jvmTarget = '1.8'
66
}
7+
}
8+
compileTestKotlin {
9+
kotlinOptions {
10+
jvmTarget = '1.8'
11+
}
712
}

‎gradle/dependencies.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ ext {
88
]
99
junitVersion = '5.3.1'
1010
jsoupVersion = '1.11.3'
11-
flexmarkVersion = '0.34.56'
12-
hamcrestVersion = '1.3'
11+
flexmarkVersion = '0.40.0'
12+
hamcrestVersion = '2.1'
1313
mockitoVersion = '2.+'
14-
striktVersion = '0.17.0'
15-
kotlin_version = '1.3.10'
14+
striktVersion = '0.17.1'
15+
kotlin_version = '1.3.11'
1616
open_html_version = '0.0.1-RC17'
1717
}

‎languageExtensions/OrchidAsciidoc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
dependencies {
3-
implementation 'org.asciidoctor:asciidoctorj:1.5.7'
3+
implementation 'org.asciidoctor:asciidoctorj:1.6.0'
44
}

‎languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/AsciiDoctorCompiler.kt

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
package com.eden.orchid.languages.asciidoc
22

3+
import com.caseyjbrooks.clog.Clog
34
import com.eden.orchid.api.compilers.OrchidCompiler
45
import org.asciidoctor.Asciidoctor
56
import org.asciidoctor.Options
6-
7+
import org.asciidoctor.log.LogHandler
8+
import org.asciidoctor.log.LogRecord
9+
import org.asciidoctor.log.Severity
710
import javax.inject.Inject
811
import javax.inject.Singleton
912

1013
@Singleton
1114
class AsciiDoctorCompiler
1215
@Inject
13-
constructor() : OrchidCompiler(800) {
16+
constructor() : OrchidCompiler(800), LogHandler {
1417

1518
private val asciidoctor: Asciidoctor = Asciidoctor.Factory.create()
1619
private val options: Options = Options()
1720

21+
init {
22+
asciidoctor.registerLogHandler(this)
23+
}
24+
1825
override fun compile(extension: String, source: String, data: Map<String, Any>): String {
1926
return asciidoctor.convert(source, options)
2027
}
@@ -26,4 +33,18 @@ constructor() : OrchidCompiler(800) {
2633
override fun getSourceExtensions(): Array<String> {
2734
return arrayOf("ad", "adoc", "asciidoc", "asciidoctor")
2835
}
36+
37+
override fun log(logRecord: LogRecord?) {
38+
if (logRecord == null) return
39+
40+
when (logRecord.severity) {
41+
Severity.DEBUG -> Clog.d(logRecord.message)
42+
Severity.INFO -> Clog.i(logRecord.message)
43+
Severity.WARN -> Clog.w(logRecord.message)
44+
Severity.ERROR -> Clog.e(logRecord.message)
45+
Severity.FATAL -> Clog.e(logRecord.message)
46+
Severity.UNKNOWN -> Clog.d(logRecord.message)
47+
else -> Clog.d(logRecord.message)
48+
}
49+
}
2950
}

‎languageExtensions/OrchidAsciidoc/src/test/kotlin/com/eden/orchid/languages/asciidoc/AsciidocTest.kt

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package com.eden.orchid.languages.asciidoc
2+
3+
import com.eden.orchid.testhelpers.OrchidIntegrationTest
4+
import com.eden.orchid.testhelpers.TestHomepageModule
5+
import com.eden.orchid.testhelpers.asHtml
6+
import com.eden.orchid.testhelpers.innerHtml
7+
import com.eden.orchid.testhelpers.matches
8+
import com.eden.orchid.testhelpers.pageWasRendered
9+
import com.eden.orchid.testhelpers.select
10+
import org.junit.jupiter.api.DisplayName
11+
import org.junit.jupiter.api.Test
12+
import strikt.api.expectThat
13+
import strikt.assertions.isEqualTo
14+
15+
@DisplayName("Tests behavior of using Asciidoc for the homepage")
16+
class AsciidocTest : OrchidIntegrationTest(TestHomepageModule()) {
17+
18+
@Test
19+
@DisplayName("Test that Markdown works normally")
20+
fun test01() {
21+
resource("homepage.md",
22+
"""
23+
|**Markdown Page**
24+
""".trimMargin()
25+
)
26+
27+
val testResults = execute()
28+
expectThat(testResults)
29+
.pageWasRendered("//index.html")
30+
.get { content }
31+
.asHtml(true)
32+
.select("body")
33+
.matches()
34+
.innerHtml()
35+
.isEqualTo(
36+
"""
37+
|<p>
38+
| <strong>Markdown Page</strong>
39+
|</p>
40+
""".trimMargin()
41+
)
42+
}
43+
44+
@Test
45+
@DisplayName("Test that Asciidoc syntax is not supported when the module is not included. Homepage file will not be found at all.")
46+
fun test02() {
47+
resource("homepage.ad",
48+
"""
49+
|**Unknown Asciidoc Page**
50+
""".trimMargin()
51+
)
52+
53+
val testResults = execute()
54+
expectThat(testResults)
55+
.pageWasRendered("//index.html")
56+
.get { content }
57+
.asHtml(true)
58+
.select("body")
59+
.matches()
60+
.innerHtml()
61+
.isEqualTo("")
62+
}
63+
64+
@Test
65+
@DisplayName("Test that Asciidoc syntax works when the file ends with .ad when the module is included")
66+
fun test03() {
67+
resource("homepage.ad",
68+
"""
69+
|**Asciidoc Page**
70+
""".trimMargin()
71+
)
72+
73+
val testResults = execute(AsciidocModule())
74+
expectThat(testResults)
75+
.pageWasRendered("//index.html")
76+
.get { content }
77+
.asHtml(true)
78+
.select("body")
79+
.matches()
80+
.innerHtml()
81+
.isEqualTo(
82+
"""
83+
|<div class="paragraph">
84+
| <p>
85+
| <strong>Asciidoc Page</strong>
86+
| </p>
87+
|</div>
88+
""".trimMargin()
89+
)
90+
}
91+
92+
}

‎languageExtensions/OrchidDiagrams/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
dependencies {
3-
implementation 'net.sourceforge.plantuml:plantuml:1.2018.11'
3+
implementation 'net.sourceforge.plantuml:plantuml:1.2018.14'
44
}

‎languageExtensions/OrchidDiagrams/src/test/kotlin/com/eden/orchid/languages/diagrams/DiagramsTest.kt

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package com.eden.orchid.languages.diagrams
2+
3+
import com.eden.orchid.testhelpers.OrchidIntegrationTest
4+
import com.eden.orchid.testhelpers.TestHomepageModule
5+
import com.eden.orchid.testhelpers.asHtml
6+
import com.eden.orchid.testhelpers.innerHtml
7+
import com.eden.orchid.testhelpers.matches
8+
import com.eden.orchid.testhelpers.pageWasRendered
9+
import com.eden.orchid.testhelpers.select
10+
import org.junit.jupiter.api.DisplayName
11+
import org.junit.jupiter.api.Test
12+
import strikt.api.expectThat
13+
import strikt.assertions.isEqualTo
14+
15+
@DisplayName("Tests behavior of using Asciidoc for the homepage")
16+
class DiagramsTest : OrchidIntegrationTest(TestHomepageModule()) {
17+
18+
@Test
19+
@DisplayName("Test that Markdown works normally")
20+
fun test01() {
21+
resource("homepage.md",
22+
"""
23+
|Bob->Alice : hello
24+
""".trimMargin()
25+
)
26+
27+
val testResults = execute()
28+
expectThat(testResults)
29+
.pageWasRendered("//index.html")
30+
.get { content }
31+
.asHtml(true)
32+
.select("body")
33+
.matches()
34+
.innerHtml()
35+
.isEqualTo("<p>Bob-&gt;Alice : hello</p>")
36+
}
37+
38+
@Test
39+
@DisplayName("Test that PlantUml syntax is not supported when the module is not included. Homepage file will not be found at all.")
40+
fun test02() {
41+
resource("homepage.uml",
42+
"""
43+
|Bob->Alice : hello
44+
""".trimMargin()
45+
)
46+
47+
val testResults = execute()
48+
expectThat(testResults)
49+
.pageWasRendered("//index.html")
50+
.get { content }
51+
.asHtml(true)
52+
.select("body")
53+
.matches()
54+
.innerHtml()
55+
.isEqualTo("")
56+
}
57+
58+
@Test
59+
@DisplayName("Test that Asciidoc syntax works when the file ends with .uml when the module is included")
60+
fun test03() {
61+
enableLogging()
62+
resource("homepage.uml",
63+
"""
64+
|Bob->Alice : hello
65+
""".trimMargin()
66+
)
67+
68+
val testResults = execute(DiagramsModule())
69+
testResults.printResults()
70+
expectThat(testResults)
71+
.pageWasRendered("//index.svg")
72+
.get { content }
73+
.asHtml(true)
74+
.select("body > svg")
75+
.matches()
76+
}
77+
78+
}

0 commit comments

Comments
 (0)