Upgrade dependencies

kordamp · Apr 20, 2019 · 4e9fd8c · 4e9fd8c
1 parent c6ab176
commit 4e9fd8c
Show file tree

Hide file tree

Showing 34 changed files with 42 additions and 42 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,9 +17,9 @@
  */
 
 plugins {
-    id 'org.kordamp.gradle.kordamp-parentpom' version '1.3.0'
-    id 'org.kordamp.gradle.build-scan'        version '0.17.0'
-    id 'org.kordamp.gradle.source-xref'       version '0.17.0'
+    id 'org.kordamp.gradle.kordamp-parentpom' version '1.5.0'
+    id 'org.kordamp.gradle.build-scan'        version '0.18.0'
+    id 'org.kordamp.gradle.source-xref'       version '0.18.0'
     id 'com.google.osdetector'                version '1.6.1'
     id 'org.jonnyzzz.java9c'                  version '0.2.3' apply false
     id 'org.javamodularity.moduleplugin'      version '1.5.0' apply false

diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle
@@ -17,7 +17,7 @@
  */
 
 plugins {
-    id 'org.kordamp.gradle.guide'   version '0.17.0'
+    id 'org.kordamp.gradle.guide'   version '0.18.0'
     id 'org.ajoberstar.git-publish' version '0.3.2'
 }
 

diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-dashicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-dashicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_dashicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_dashicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-devicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-devicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_devicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_devicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-elusive.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-elusive.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_elusive_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_elusive_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-entypo.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-entypo.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_entypo_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_entypo_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-feather.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-feather.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_feather_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_feather_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-fontawesome.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-fontawesome.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_fontawesome_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_fontawesome_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-fontawesome5.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-fontawesome5.adoc
@@ -17,7 +17,7 @@ font resources.
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_fontawesome5_brands_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_fontawesome5_brands_cheat_sheet.adoc[]
 
 == Regular
 
@@ -32,7 +32,7 @@ include::{projectDir}/build/tmp/_fontawesome5_brands_cheat_sheet.adoc[]
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_fontawesome5_regular_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_fontawesome5_regular_cheat_sheet.adoc[]
 
 == Solid
 
@@ -47,4 +47,4 @@ include::{projectDir}/build/tmp/_fontawesome5_regular_cheat_sheet.adoc[]
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_fontawesome5_solid_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_fontawesome5_solid_cheat_sheet.adoc[]
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-fontelico.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-fontelico.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_fontelico_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_fontelico_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-foundation.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-foundation.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_foundation_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_foundation_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-hawconsfilled.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-hawconsfilled.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_hawconsfilled_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_hawconsfilled_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-hawconsstroke.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-hawconsstroke.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_hawconsstroke_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_hawconsstroke_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-icomoon.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-icomoon.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_icomoon_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_icomoon_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-ionicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-ionicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_ionicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_ionicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-ionicons4.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-ionicons4.adoc
@@ -11,7 +11,7 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_ionicons4_IOS_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_ionicons4_IOS_cheat_sheet.adoc[]
 
 == Material
 
@@ -24,7 +24,7 @@ include::{projectDir}/build/tmp/_ionicons4_IOS_cheat_sheet.adoc[]
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_ionicons4_Material_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_ionicons4_Material_cheat_sheet.adoc[]
 
 == Logo
 
@@ -38,4 +38,4 @@ include::{projectDir}/build/tmp/_ionicons4_Material_cheat_sheet.adoc[]
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_ionicons4_Logo_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_ionicons4_Logo_cheat_sheet.adoc[]
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-ligaturesymbols.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-ligaturesymbols.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_ligaturesymbols_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_ligaturesymbols_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-maki.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-maki.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_maki_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_maki_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-maki2.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-maki2.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_maki2_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_maki2_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-mapicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-mapicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_mapicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_mapicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-material.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-material.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_material_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_material_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-materialdesign.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-materialdesign.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_materialdesign_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_materialdesign_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-metrizeicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-metrizeicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_metrizeicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_metrizeicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-octicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-octicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_octicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_octicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-openiconic.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-openiconic.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_openiconic_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_openiconic_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-paymentfont.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-paymentfont.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_paymentfont_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_paymentfont_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-runestroicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-runestroicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_runestroicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_runestroicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-themify.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-themify.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_themify_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_themify_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-typicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-typicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_typicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_typicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-weathericons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-weathericons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_weathericons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_weathericons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-websymbols.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-websymbols.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_websymbols_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_websymbols_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-zondicons.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-zondicons.adoc
@@ -9,5 +9,5 @@
 </style>
 ++++
 
-include::{projectDir}/build/tmp/_zondicons_cheat_sheet.adoc[]
+include::{gradle-projectdir}/build/tmp/_zondicons_cheat_sheet.adoc[]
 
diff --git a/docs/guide/src/docs/asciidoc/index.adoc b/docs/guide/src/docs/asciidoc/index.adoc
@@ -14,9 +14,9 @@
 :project-group: org.kordamp.ikonli
 
 :leveloffset: 1
-include::introduction.adoc[]
-include::usage.adoc[]
-include::icon-packs.adoc[]
+include::{includedir}/introduction.adoc[]
+include::{includedir}/usage.adoc[]
+include::{includedir}/icon-packs.adoc[]
 
 = Links
 

diff --git a/settings.gradle b/settings.gradle
@@ -37,4 +37,4 @@ rootProject.name = 'ikonli'
 
 projects {
     directories = ['docs', 'core', 'icon-packs', 'apps']
-}
+}