Bump to Gradle 9.0.0.

Author: craigthomas

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id 'application'
-    id 'com.gradleup.shadow' version '8.3.8'
+    id 'com.gradleup.shadow' version '9.0.0-rc3'
     id 'org.sonarqube' version '6.2.0.5505'
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -111,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -144,15 +147,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,16 +204,16 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2018 Craig Thomas
+ * This project uses an MIT style license - see LICENSE for details.
+ */
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
+
+import java.awt.*;
+
+public class G6RArtifactScreenMode extends ScreenMode
+{
+    /* Screen size for the mode */
+    private static final int SCREEN_WIDTH = 320;
+    private static final int SCREEN_HEIGHT = 240;
+
+    /* Block definitions */
+    private static final int BLOCK_WIDTH = 2;
+    private static final int BLOCK_HEIGHT = 1;
+    private static final int BLOCKS_PER_BYTE = 8;
+
+    /* Color definitions for graphics G3R mode */
+    private final Color colors[][] = {
+            {
+                // Color Mode 0
+                new Color(0, 0, 0, 255),        /* Black */
+                new Color(40, 224, 40, 255),    /* Green */
+                new Color(240, 136, 40, 255),   /* Orange Artifact */
+                new Color(32, 32, 216, 255),    /* Blue Artifact */
+            }, {
+                // Color Mode 1
+                new Color(0, 0, 0, 255),        /* Black */
+                new Color(32, 32, 216, 255),    /* Blue Artifact */
+                new Color(255, 60, 32, 255),    /* Orange Artifact */
+                new Color(240, 240, 240, 255),  /* White */
+            }
+    };
+
+    private final Color background = new Color(240, 240, 240, 255);
+
+    // The color mode to apply
+    private int colorMode;
+
+    public G6RArtifactScreenMode(int scale, int colorMode) {
+        this.scale = scale;
+        this.width = SCREEN_WIDTH;
+        this.height = SCREEN_HEIGHT;
+        this.colorMode = colorMode;
+        createBackBuffer();
+    }
+
+    @Override
+    public void refreshScreen() {
+        Graphics2D graphics = backBuffer.createGraphics();
+        graphics.setColor(background);
+        graphics.fillRect(0, 0, width * scale, height * scale);
+
+        int memoryPointer = memoryOffset;
+
+        for (int y = 0; y < 192; y++) {
+            for (int x = 0; x < 32; x++) {
+                UnsignedByte value = io.readPhysicalByte(memoryPointer);
+                drawCharacter(value, x, y);
+                memoryPointer++;
+            }
+        }
+
+        graphics.dispose();
+    }
+
+    /**
+     * For proper artifact colors, we need to collect an entire line of pixels
+     * in an array. There are 256 pixels across a horizontal scan line. In this
+     * mode, pixels are either off (0% intensity) or on (100% intensity). The
+     * quirk for this mode has to do with transitioning between pixel intensities.
+     * The pixel 
+     *
+     * @param col
+     * @param row
+     * @param color
+     */
+
+    private void drawBlock(int col, int row, int color) {
+        for (int x = col; x < col + BLOCK_WIDTH; x++) {
+            for (int y = row; y < row + BLOCK_HEIGHT; y++) {
+                drawPixel(x, y, colors[colorMode][color]);
+            }
+        }
+    }
+
+    private void drawCharacter(UnsignedByte value, int col, int row) {
+        /* Translated position in pixels */
+        int x = 32 + (col * 8);
+        int y = 24 + (row * BLOCK_HEIGHT);
+
+        /* Pixel 1 */
+        int color = (value.get() & 0xC0) >> 6;
+        drawBlock(x, y, color);
+
+        /* Pixel 2 */
+        color = (value.get() & 0x30) >> 4;
+        drawBlock(x + BLOCK_WIDTH, y, color);
+
+        /* Pixel 3 */
+        color = (value.get() & 0xC) >> 2;
+        drawBlock(x + (BLOCK_WIDTH * 2), y, color);
+
+        /* Pixel 4 */
+        color = (value.get() & 0x3);
+        drawBlock(x + (BLOCK_WIDTH * 3), y, color);
+    }
+}

src/main/java/ca/craigthomas/yacoco3e/datatypes/screen/G6RArtifactScreenMode.java

@@ -31,7 +31,7 @@ public class G6RScreenMode extends ScreenMode
                 // Color Mode 1
                 new Color(0, 0, 0, 255),        /* Black */
                 new Color(32, 32, 216, 255),    /* Blue Artifact */
-                new Color(255, 60, 32, 255),   /* Orange Artifact */
+                new Color(255, 60, 32, 255),    /* Orange Artifact */
                 new Color(240, 240, 240, 255),  /* White */
             }
     };