Merge branch 'master' into fix-926-extension-config-symbols

Author: robertpanzer

CHANGELOG.adoc

@@ -15,7 +15,8 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 Bug Fixes::
 
-* Inline macro attribute parsing changes after first document conversion (@wilkinsona) (#926)
+  * Inline macro attribute parsing changes after first document conversion (@wilkinsona) (#926)
+  * Upgrade to Rouge 3.20.0, fixing error `uninitialized constant Rouge::Lexers` problem (@ahus1) (#925)
 
 == 2.3.0 (2020-05-02)
 

build.gradle

@@ -59,7 +59,7 @@ ext {
   // gem versions
   asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.10'
   coderayGemVersion = '1.1.2'
-  rougeGemVersion = '3.12.0'
+  rougeGemVersion = '3.20.0'
 
   codenarcVersion = '0.24.1'
   groovyVersion = '2.4.13'

chocolatey/asciidoctorj.nuspec

@@ -5,7 +5,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>asciidoctorj</id>
     <title>AsciidoctorJ (Install)</title>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <!--
       https://github.com/asciidoctor/asciidoctorj/graphs/contributors
       https://github.com/asciidoctor/asciidoctor/graphs/contributors
@@ -29,7 +29,8 @@
     <copyright>2012-2019 Dan Allen, Ryan Waldron and the Asciidoctor Project</copyright>
     <licenseUrl>https://raw.githubusercontent.com/asciidoctor/asciidoctorj/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>https://raw.githubusercontent.com/asciidoctor/brand/master/logo/logo-fill-color.svg?sanitize=true</iconUrl>
+    <!-- <iconUrl>https://raw.githubusercontent.com/asciidoctor/brand/master/logo/logo-fill-color.svg?sanitize=true</iconUrl> -->
+    <iconUrl>https://cdn.statically.io/gh/asciidoctor/brand/b9cf5e27/logo/logo-fill-color.svg</iconUrl>
     <!--
       XXX Add other JREs and JVMs when https://github.com/chocolatey/choco/issues/879 is fixed?
     <dependencies>

chocolatey/tools/chocolateyinstall.ps1

@@ -4,7 +4,7 @@
 
 $ErrorActionPreference = 'Stop'; # stop on all errors
 
-$adocjVersion = '2.2.0'
+$adocjVersion = '2.3.0'
 $packageName= 'asciidoctorj' # arbitrary name for the package, used in messages
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 # Which is the preferred mirror? There are many listed at
@@ -18,7 +18,7 @@ $packageArgs = @{
   packageName   = $packageName
   unzipLocation = $toolsDir
   url           = $url
-  checksum      = 'd5240240a4e39f4f9c56abab2da3e960a4784b7d8e7befa323fc9f64890f0029'
+  checksum      = '2557edc4db4787aa0b3f5266728414862fa770a92f8d6ac407b34c47b4b02e7c'
   checksumType  = 'sha256' #default is md5, can also be sha1
   #checksum64    = ''
   #checksumType64= 'md5' #default is checksumType