[TF-239] Update java version to 19 and gradle to 8.1

.github/dependabot.yml

@@ -1,17 +1,17 @@
 version: 2
 updates:
-- package-ecosystem: gradle
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: com.github.kt3k.coveralls
-    versions:
-    - "> 2.8.2"
-  - dependency-name: commons-codec:commons-codec
-    versions:
-    - "> 1.6"
-  - dependency-name: net.nemerosa.versioning
-    versions:
-    - "> 2.7.1"
+  - package-ecosystem: gradle
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: com.github.kt3k.coveralls
+        versions:
+          - "> 2.12.2"
+      - dependency-name: commons-codec:commons-codec
+        versions:
+          - "> 1.6"
+      - dependency-name: net.nemerosa.versioning
+        versions:
+          - "> 2.7.1"

.github/workflows/gradle.yml

@@ -3,9 +3,9 @@ name: Gradle Package
 on:
   push:
     branches:
-      - '**'
+      - "**"
     tags:
-      - '**'
+      - "**"
   release:
     types: [created]
 
@@ -17,27 +17,27 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        server-id: github
-        settings-path: ${{ github.workspace }}
+      - uses: actions/checkout@v2
+      - name: Set up JDK 19
+        uses: actions/setup-java@v2
+        with:
+          java-version: "19"
+          distribution: "adopt"
+          server-id: github
+          settings-path: ${{ github.workspace }}
 
-    - name: Display bradle version
-      run: ./gradlew versionDisplay
+      - name: Display bradle version
+        run: ./gradlew versionDisplay
 
-    - name: Build with Gradle
-      run: ./gradlew build
+      - name: Build with Gradle
+        run: ./gradlew build
 
-    - name: Gradle report
-      run: ./gradlew jacocoTestReport coveralls
+      - name: Gradle report
+        run: ./gradlew jacocoTestReport coveralls
 
-    - name: Publish to GitHub Packages
-      if: startsWith(github.ref, 'refs/tags/')
-      run: ./gradlew publish
-      env:
-        GITHUB_USERNAME: ${{ github.actor }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish to GitHub Packages
+        if: startsWith(github.ref, 'refs/tags/')
+        run: ./gradlew publish
+        env:
+          GITHUB_USERNAME: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.tool-versions

@@ -0,0 +1 @@
+java adoptopenjdk-19.0.2+7

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "java.configuration.updateBuildConfiguration": "automatic"
+}

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).  
 This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).  
 
+## Unrelased
+
+* [TF-239] Update java version to 19 and gradle version to 8.1
+
 ## 1.8.0
 
 * [TT-11417] Implemented adjustable margin sizes in TicketPageSettings

build.gradle

@@ -2,23 +2,23 @@ plugins {
     id "com.jfrog.bintray" version "1.8.5"
     id "maven-publish"
     id 'java-library'
-    id 'net.nemerosa.versioning' version '2.7.1'
+    id 'net.nemerosa.versioning' version '3.0.0'
     id 'jacoco'
     id 'checkstyle'
-    id 'com.github.kt3k.coveralls' version '2.8.2'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
 }
 group = 'au.com.sealink'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_19
+targetCompatibility = JavaVersion.VERSION_19
 tasks.withType(JavaCompile) {
-	options.encoding = 'UTF-8'
+    options.encoding = 'UTF-8'
 }
 
 jacocoTestReport {
     reports {
-        xml.enabled = true // coveralls plugin depends on xml format report
-        html.enabled = true
+        xml.required.set(true) // coveralls plugin depends on xml format report
+        html.required.set(true)
     }
 }
 
@@ -44,22 +44,34 @@ checkstyle {
     toolVersion = '8.1'
 }
 
+checkstyle {
+    configProperties = [
+            'allowStaticMemberImports': 'true'
+    ]
+}
+
 repositories {
     google()
     mavenCentral()
     jcenter()
 }
 
 dependencies {
-    compile group: 'commons-codec', name: 'commons-codec', version:'1.6'
-    testCompile 'junit:junit:4.13.2'
+    implementation group: 'commons-codec', name: 'commons-codec', version:'1.15'
+    testImplementation 'junit:junit:4.13.2'
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
+task versionInfo {
+    doLast {
+        println "Version: ${project.version}"
+    }
+}
+
 artifacts {
     archives sourcesJar
 }
@@ -89,9 +101,7 @@ publishing {
     publications {
         mavenPublication(MavenPublication) {
             from components.java
-            artifact sourcesJar {
-                classifier "sources"
-            }
+            artifact sourcesJar
             groupId 'au.com.sealink'
             artifactId 'printing'
             version project.version

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/au/com/sealink/printing/receipt/EpsonPrinter.java

@@ -1,8 +1,8 @@
 package au.com.sealink.printing.receipt;
 
 import au.com.sealink.printing.receipt.*;
-import au.com.sealink.printing.ticket_printer.Justification;
-import au.com.sealink.printing.ticket_printer.Underline;
+import au.com.sealink.printing.ticketprinter.Justification;
+import au.com.sealink.printing.ticketprinter.Underline;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -74,7 +74,7 @@ public void close() throws IOException {
 
     @Override
     public IPrinter cut(CutMode mode) throws IOException {
-        switch(mode) {
+        switch (mode) {
             case PARTIAL:
                 getConnector().write(PAPER_PART_CUT);
                 break;

src/main/java/au/com/sealink/printing/receipt/IPrinter.java

@@ -1,27 +1,41 @@
 package au.com.sealink.printing.receipt;
 
-import au.com.sealink.printing.ticket_printer.Justification;
-import au.com.sealink.printing.ticket_printer.Underline;
-
+import au.com.sealink.printing.ticketprinter.Justification;
+import au.com.sealink.printing.ticketprinter.Underline;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 
 public interface IPrinter {
     OutputStream getConnector();
+
     IPrinter initialise() throws IOException;
+
     void close() throws IOException;
+
     IPrinter cut(CutMode mode) throws IOException;
+
     IPrinter feed(int numberOfLines) throws IOException;
+
     IPrinter feed() throws IOException;
+
     IPrinter text(String text) throws IOException;
+
     IPrinter setFont(Font font) throws IOException;
+
     IPrinter setMode(PrintMode mode) throws IOException;
+
     IPrinter setUnderline(Underline mode) throws IOException;
+
     IPrinter setDoubleWidth(Boolean isEnabled) throws IOException;
+
     IPrinter setDoubleHeight(Boolean isEnabled) throws IOException;
+
     IPrinter setJustification(Justification justification) throws IOException;
+
     IPrinter setColour(Colour colour) throws IOException;
+
     IPrinter setEmphasis(Boolean isEnabled) throws IOException;
+
     IPrinter printImage(BufferedImage image) throws IOException;
 }

src/main/java/au/com/sealink/printing/receipt/Image.java

@@ -36,9 +36,13 @@ public byte[] recollectSlice(int y, int x, int[][] img) {
 
     private boolean shouldPrintColor(int col) {
         final int threshold = 127;
-        int a, r, g, b, luminance;
+        int a;
+        int r;
+        int g;
+        int b;
+        int luminance;
         a = (col >> 24) & 0xff;
-        if (a != 0xff) {// Ignore transparencies
+        if (a != 0xff) { // Ignore transparencies
             return false;
         }
         r = (col >> 16) & 0xff;

src/main/java/au/com/sealink/printing/ticket_printer/FontStyle.java → src/main/java/au/com/sealink/printing/ticketprinter/FontStyle.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 public enum FontStyle {
     Bold, Italic, Inverted

src/main/java/au/com/sealink/printing/ticket_printer/Justification.java → src/main/java/au/com/sealink/printing/ticketprinter/Justification.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 public enum Justification {
     LEFT,

src/main/java/au/com/sealink/printing/ticket_printer/PrintServiceLocator.java → src/main/java/au/com/sealink/printing/ticketprinter/PrintServiceLocator.java

@@ -1,8 +1,9 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
+import au.com.sealink.printing.ticketprinter.exceptions.NoSuchPrinterException;
 import java.awt.print.PrinterJob;
 import javax.print.PrintService;
-import au.com.sealink.printing.ticket_printer.exceptions.NoSuchPrinterException;
+
 
 public class PrintServiceLocator {
 

src/main/java/au/com/sealink/printing/ticket_printer/ReceiptPrinter.java → src/main/java/au/com/sealink/printing/ticketprinter/ReceiptPrinter.java

@@ -1,14 +1,14 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 import au.com.sealink.printing.receipt.CutMode;
 import au.com.sealink.printing.receipt.EpsonPrinter;
-import au.com.sealink.printing.ticket_printer.exceptions.NoSuchPrinterException;
+import au.com.sealink.printing.ticketprinter.exceptions.NoSuchPrinterException;
 import au.com.sealink.printing.utils.ImageLoader;
 
-import javax.print.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import javax.print.*;
 
 public class ReceiptPrinter {
     private final PrintService printer;

src/main/java/au/com/sealink/printing/ticket_printer/Ticket.java → src/main/java/au/com/sealink/printing/ticketprinter/Ticket.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 import java.util.ArrayList;
 

src/main/java/au/com/sealink/printing/ticket_printer/TicketElement.java → src/main/java/au/com/sealink/printing/ticketprinter/TicketElement.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 import java.util.EnumSet;
 

src/main/java/au/com/sealink/printing/ticket_printer/TicketPageSettings.java → src/main/java/au/com/sealink/printing/ticketprinter/TicketPageSettings.java

@@ -1,10 +1,9 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
+import au.com.sealink.printing.utils.NumberConverter;
 import java.awt.print.PageFormat;
 import java.awt.print.Paper;
 
-import au.com.sealink.printing.utils.NumberConverter;
-
 public class TicketPageSettings {
 
     private double width; // = 87f;

src/main/java/au/com/sealink/printing/ticket_printer/TicketPrinter.java → src/main/java/au/com/sealink/printing/ticketprinter/TicketPrinter.java

@@ -1,14 +1,14 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
+import au.com.sealink.printing.ticketprinter.exceptions.NoSuchPrinterException;
+import au.com.sealink.printing.ticketprinter.exceptions.NoTicketPageSettingsAssigned;
+import au.com.sealink.printing.ticketprinter.printables.PrintableTickets;
 import java.awt.print.Printable;
 import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
 import java.util.List;
 import javax.print.PrintService;
 
-import au.com.sealink.printing.ticket_printer.exceptions.NoSuchPrinterException;
-import au.com.sealink.printing.ticket_printer.exceptions.NoTicketPageSettingsAssigned;
-import au.com.sealink.printing.ticket_printer.printables.PrintableTickets;
 
 /*
  * TicketPrintCommand

src/main/java/au/com/sealink/printing/ticket_printer/Underline.java → src/main/java/au/com/sealink/printing/ticketprinter/Underline.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer;
+package au.com.sealink.printing.ticketprinter;
 
 public enum Underline {
     None,

src/main/java/au/com/sealink/printing/ticket_printer/exceptions/NoSuchPrinterException.java → src/main/java/au/com/sealink/printing/ticketprinter/exceptions/NoSuchPrinterException.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer.exceptions;
+package au.com.sealink.printing.ticketprinter.exceptions;
 
 public class NoSuchPrinterException extends Exception {
 

src/main/java/au/com/sealink/printing/ticket_printer/exceptions/NoTicketPageSettingsAssigned.java → src/main/java/au/com/sealink/printing/ticketprinter/exceptions/NoTicketPageSettingsAssigned.java

@@ -1,4 +1,4 @@
-package au.com.sealink.printing.ticket_printer.exceptions;
+package au.com.sealink.printing.ticketprinter.exceptions;
 
 public class NoTicketPageSettingsAssigned extends Exception {
 

src/main/java/au/com/sealink/printing/ticket_printer/printables/PrintableElement.java → src/main/java/au/com/sealink/printing/ticketprinter/printables/PrintableElement.java

@@ -1,9 +1,8 @@
-package au.com.sealink.printing.ticket_printer.printables;
+package au.com.sealink.printing.ticketprinter.printables;
 
+import au.com.sealink.printing.ticketprinter.TicketElement;
 import java.awt.Graphics2D;
 
-import au.com.sealink.printing.ticket_printer.TicketElement;
-
 public abstract class PrintableElement {
 
     TicketElement element;