Upgrade build

Author: ggrossetie

.github/workflows/ci.yml

@@ -2,31 +2,20 @@
 
 This is an awesome book. It's written in AsciiDoc and compiles to HTML, PDF, EPUB, and MOBI using the http://asciidoctor.org/docs/asciidoctor-gradle-plugin/[Asciidoctor Gradle plugin].
 
-== Building
-
-To convert this book to HTML, EPUB, and MOBI, run the following command:
-
-----
-$ build.sh
-----
+== Installing
 
-To convert this book to a 6x9" PDF for printing:
+ $ npm run setup
 
-----
-$ generate-pdf.sh
-----
+== Building
 
-To convert this book to a 8.5x11" PDF for downloading:
+To convert this book to HTML and EPUB, run the following command:
 
-----
-$ generate-pdf.sh screen
-----
+ $ npm run build
 
-* Open _build/asciidoc/html5/index.html_ in your browser to see the generated HTML file.
-* Open _build/asciidoc/pdf-prepress/index.pdf_ to see the 6x9" printable PDF file.
-* Open _build/asciidoc/pdf-pdf-screen/index.pdf_ to see the downloadable 8.5x11" PDF file.
-* Open _build/asciidoc/epub3/index.epub_ in iBooks to see the generated EPUB file.
-* Open _build/asciidoc/epub3/index.mobi_ in http://calibre-ebook.com/[Calibre] to see the generated MOBI file.
+* Open build/asciidoc/html5/index.html in your browser to see the generated HTML file.
+* Open build/asciidoc/pdf-prepress/index.pdf to see the 6x9" printable PDF file.
+* Open build/asciidoc/pdf-screen/index.pdf to see the downloadable 8.5x11" PDF file.
+* Open build/asciidoc/epub3/index.epub in iBooks to see the generated EPUB file.
 
 == Sweet Authoring Experience
 

README.adoc

@@ -1,46 +1,47 @@
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
-        classpath 'com.bluepapa32:gradle-watch-plugin:0.1.5'
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
-        classpath 'org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.7'
-        classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-        classpath 'org.jruby:jruby-complete:9.1.12.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0'
+        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
+        classpath 'org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.19'
+        classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.4'
+        classpath 'org.jruby:jruby-complete:9.2.16.0'
     }
 }
 
 plugins {
-    id "de.undercouch.download" version "3.4.2"
+    id 'de.undercouch.download' version '4.1.1'
+    id 'se.patrikerdes.use-latest-versions' version '0.2.15'
+    id 'com.github.ben-manes.versions' version '0.38.0'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.asciidoctor.convert'
 apply plugin: 'com.github.ben-manes.versions'
-apply plugin: 'com.bluepapa32.watch'
 
 version = '5.0.3'
 
 asciidoctorj {
-    version = '1.5.7'
+    version = '2.4.2'
 }
 
 import org.asciidoctor.gradle.AsciidoctorTask
-import org.gradle.internal.os.OperatingSystem
 
 def attrs = ['sourcedir'         : '../../../main/webapp',
-             'source-highlighter': 'coderay',
+             'source-highlighter': 'rouge',
              'epub3-stylesdir'   : './styles/epub',
              // NOTE don't include leading ./ because it messes up paths in the epub files
              'imagesdir'         : 'images',
              'toc'               : 'left',
              'icons'             : 'font',
              'sectanchors'       : '',
              'idprefix'          : '',
-             'idseparator'       : '-']
+             'idseparator'       : '-',
+             'listing-caption'   : 'Listing']
 
 tasks.withType(AsciidoctorTask) { task ->
     attributes attrs
@@ -53,66 +54,31 @@ task html(type: AsciidoctorTask, description: 'Generates single page HTML') {
     backends 'html5'
 }
 
-// NOTE please use ./generate-pdf.sh instead of this task for now
 task prepress(type: AsciidoctorTask, description: 'Generates PDF for prepress printing') {
-    attributes attrs + ['media' : 'prepress', 'pdfmarks': '', 'pdf-theme': 'infoq-prepress']
+    attributes attrs + ['media' : 'prepress', 'pdfmarks': '', 'pdf-theme': 'prepress']
     attrs.remove('source-highlighter')
     requires file('src/main/ruby/asciidoctor-pdf-extensions.rb')
     backends 'pdf'
     outputDir "$buildDir/asciidoc/pdf-prepress"
     separateOutputDirs false
 }
 
-// NOTE please use ./generate-pdf.sh screen instead of this task for now
-task pdf(type: AsciidoctorTask, description: 'Generates PDF') {
-    attributes attrs + ['pdfmarks': '']
+task pdf(type: AsciidoctorTask, description: 'Generates PDF for download') {
+    attributes attrs + ['pdfmarks': '', 'source-highlighter': 'rouge']
     requires file('src/main/ruby/asciidoctor-pdf-extensions.rb')
+    outputDir "$buildDir/asciidoc/pdf-screen"
     backends 'pdf'
+    separateOutputDirs false
 }
 
 task epub(type: AsciidoctorTask, description: 'Generates EPUB3') {
     backends 'epub3'
 }
 
-task mobi(type: AsciidoctorTask, description: 'Generates MOBI') {
-    backends 'epub3'
-    attrs.put('ebook-format', 'kf8')
-    attributes attrs
-}
-
-task downloadKindlegen(type: Download) {
-    ext.output = file("$buildDir/kindlegen/kindlegen" + (OperatingSystem.current().isMacOsX() ? '.zip' : '.tgz'))
-    src OperatingSystem.current().isMacOsX() ? 'https://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v2_9.zip' : 'http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v2_9.tar.gz'
-    dest output
-    overwrite false
-    onlyIfModified true
-}
-
-task extractKindlegen(type: Copy) {
-  dependsOn downloadKindlegen
-  from {
-    if (downloadKindlegen.output.name.endsWith('.zip')) {
-      zipTree(downloadKindlegen.output)
-    }
-    else {
-      tarTree(downloadKindlegen.output)
-    }
-  }
-  into "$buildDir/kindlegen/"
-}
-
-mobi.dependsOn extractKindlegen
 pdf.shouldRunAfter html
-epub.shouldRunAfter pdf
+prepress.shouldRunAfter pdf
+epub.shouldRunAfter prepress
 
-//task all(dependsOn: ['html', 'pdf', 'epub', 'mobi'])
-task all(dependsOn: ['html', 'epub', 'mobi'])
+task all(dependsOn: ['html', 'pdf', 'prepress', 'epub'])
 
 defaultTasks 'all'
-
-watch {
-    asciidoc {
-        files fileTree(dir: 'src/docs/asciidoc', include: '**/*.adoc')
-        tasks 'asciidoctor'
-    }
-}

build-clean.sh

@@ -0,0 +1 @@
+org.gradle.vfs.watch=true

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

build.sh

@@ -8,8 +8,13 @@
     "type": "git",
     "url": "git@bitbucket.org:mraible/jhipster-book.git"
   },
+  "scripts": {
+    "build": "bash ./gradlew all",
+    "clean": "bash ./gradlew clean",
+    "setup": "npm install && npm run build"
+  },
   "devDependencies": {
-    "gulp": "4.0.2",
-    "browser-sync": "2.26.7"
+    "browser-sync": "^2.26.14",
+    "gulp": "4.0.2"
   }
 }

generate-pdf.sh

@@ -21,7 +21,7 @@ endif::[]
 :experimental:
 :pdf-fontsdir: ./styles/pdf/fonts
 :pdf-stylesdir: ./styles/pdf
-:pdf-style: infoq-screen
+:pdf-style: screen
 ifndef::ebook-format[:leveloffset: 1]
 
 [colophon#colophon%nonfacing]

gradle.properties

@@ -3,7 +3,7 @@
 module AsciidoctorPdfExtensions
   # Override the built-in layout_toc to move colophon before front of table of contents
   # NOTE we assume that the colophon fits on a single page
-  def layout_toc doc, num_levels = 2, toc_page_number = 2, num_front_matter_pages = 0
+  def layout_toc doc, num_levels = 2, toc_page_number = 2, start_y = nil, num_front_matter_pages = 0
     go_to_page toc_page_number unless (page_number == toc_page_number) || scratch?
     if scratch?
       colophon = doc.find_by(context: :section) {|sect| sect.sectname == 'colophon' }
@@ -20,7 +20,7 @@ def layout_toc doc, num_levels = 2, toc_page_number = 2, num_front_matter_pages
       end
     end
     offset = colophon && !@ppbook ? 1 : 0
-    toc_page_numbers = super doc, num_levels, (toc_page_number + offset), num_front_matter_pages
+    toc_page_numbers = super doc, num_levels, (toc_page_number + offset), start_y, num_front_matter_pages
     scratch? ? ((toc_page_numbers.begin - offset)..toc_page_numbers.end) : toc_page_numbers
   end
 
@@ -42,10 +42,10 @@ def layout_chapter_title node, title, opts = {}
       if node.document.attr? 'media', 'prepress'
         move_down 325
       else
-        move_down 450
+        move_down 460
       end
       layout_heading title, size: @theme.base_font_size
-    elsif sect_id.include? 'jhipster' # chapters
+    elsif sect_id.include? 'chapter' # chapters
       #puts 'Processing ' + sect_id + '...'
       # use Akkurat font for all custom headings
       font 'Akkurat' do
@@ -62,12 +62,24 @@ def layout_chapter_title node, title, opts = {}
         move_up 40
 
         part_number = 'ONE'
-        if sect_id.include? 'ui-components'
+        if sect_id.include? 'chapter-2'
           part_number = 'TWO'
-        elsif sect_id.include? 'api'
+        elsif sect_id.include? 'chapter-3'
           part_number = 'THREE'
-        elsif sect_id.include? 'microservices'
-            part_number = 'FOUR'
+        elsif sect_id.include? 'chapter-4'
+          part_number = 'FOUR'
+        elsif sect_id.include? 'chapter-5'
+          part_number = 'FIVE'
+        elsif sect_id.include? 'chapter-6'
+          part_number = 'SIX'
+        elsif sect_id.include? 'chapter-7'
+          part_number = 'SEVEN'
+        elsif sect_id.include? 'chapter-8'
+          part_number = 'EIGHT'
+        elsif sect_id.include? 'chapter-9'
+          part_number = 'NINE'
+        elsif sect_id.include? 'chapter-10'
+          part_number = 'TEN'
         end
         if @ppbook
           layout_heading part_number, align: :right, size: 100, style: :bold