From 9abea4cfee2294e3ab6e3558a5c28ef994ccb0eb Mon Sep 17 00:00:00 2001 From: Brad Barnhill Date: Sun, 30 Jun 2024 14:47:47 -0500 Subject: [PATCH] remove invalid encoding type of unspecified, build with gradle 8.8 --- build.gradle.kts | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- src/main/java/com/pnuema/java/barcode/Barcode.java | 4 ++-- src/main/java/com/pnuema/java/barcode/EncodingType.java | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 61d6d0a..ab4bf4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ buildscript { - extra["gradle"] = "8.7" + extra["gradle"] = "8.8" extra["javaVersion"] = JavaVersion.VERSION_11 } diff --git a/gradle.properties b/gradle.properties index 0b43e72..087b333 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.pnuema.java -VERSION_NAME=2.6.4 +VERSION_NAME=2.7.0 POM_ARTIFACT_ID=barcode POM_NAME=Barcode-Java diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/src/main/java/com/pnuema/java/barcode/Barcode.java b/src/main/java/com/pnuema/java/barcode/Barcode.java index 6b6e9ef..bb5a095 100644 --- a/src/main/java/com/pnuema/java/barcode/Barcode.java +++ b/src/main/java/com/pnuema/java/barcode/Barcode.java @@ -27,7 +27,7 @@ public enum AlignmentPositions {CENTER, LEFT, RIGHT} private String rawData = ""; private String encodedValue = ""; private String countryAssigningManufacturerCode = "N/A"; - private EncodingType encodedType = EncodingType.UNSPECIFIED; + private EncodingType encodedType = null; private Color foreColor = Color.BLACK; private Color backColor = Color.WHITE; private int width = 300; @@ -491,7 +491,7 @@ private Image encode() { throw new IllegalArgumentException("EENCODE-1: Input data not allowed to be blank."); } - if (getEncodedType() == EncodingType.UNSPECIFIED) { + if (getEncodedType() == null) { throw new IllegalArgumentException("EENCODE-2: Symbology type not allowed to be unspecified."); } diff --git a/src/main/java/com/pnuema/java/barcode/EncodingType.java b/src/main/java/com/pnuema/java/barcode/EncodingType.java index c0ab94a..0eab093 100644 --- a/src/main/java/com/pnuema/java/barcode/EncodingType.java +++ b/src/main/java/com/pnuema/java/barcode/EncodingType.java @@ -4,7 +4,6 @@ * Barcode symbologies */ public enum EncodingType { - UNSPECIFIED, UPCA, UPCE, UPC_SUPPLEMENTAL_2DIGIT,