From 67c70abb41ab1221f28d0d692e1592d62821cd61 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Fri, 26 May 2023 20:14:55 +0200
Subject: [PATCH] build fixes

---
 .idea/gradle.xml                     | 2 +-
 .idea/misc.xml                       | 2 +-
 build.gradle.kts                     | 4 ++--
 src/test/kotlin/Test6502CpuBasics.kt | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5be585..50e25ff 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,7 +9,7 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/share/java/gradle" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="openjdk-11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1fcc9ec..4dddcb5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,5 +7,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="Kotlin SDK" project-jdk-type="KotlinSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="openjdk-11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ff84fce..94cc2eb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import kotlin.math.max
 
 plugins {
     // Apply the Kotlin JVM plugin to add support for Kotlin on the JVM.
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.8.21"
     `maven-publish`
     application
     java
@@ -24,7 +24,7 @@ allprojects {
     }
     version = versionProps["version"] as String
     group = "net.razorvine"
-    base.archivesBaseName = "ksim65"
+    // base.archivesBaseName = "ksim65"
 
     repositories {
         // You can declare any Maven/Ivy/file repository here.
diff --git a/src/test/kotlin/Test6502CpuBasics.kt b/src/test/kotlin/Test6502CpuBasics.kt
index 0b55c9b..4defd6b 100644
--- a/src/test/kotlin/Test6502CpuBasics.kt
+++ b/src/test/kotlin/Test6502CpuBasics.kt
@@ -153,14 +153,14 @@ class Test6502CpuBasics {
         val bus = Bus()
         bus.add(cpu)
         cpu.breakpointForBRK = { _, pc -> fail("brk instruction at \$${hexW(pc)}") }
-        cpu.addBreakpoint(0xffee) { cpu, pc ->
+        cpu.addBreakpoint(0xffee) { cpu2, pc ->
             // OSWRCH write character
-            print("${cpu.regA.toChar()}")
+            print("${cpu2.regA.toChar()}")
             Cpu6502.BreakpointResultAction()
         }
-        cpu.addBreakpoint(0xffe0) { cpu, pc ->
+        cpu.addBreakpoint(0xffe0) { cpu2, pc ->
             // OSRDCH read character
-            cpu.regA = testChoice.code
+            cpu2.regA = testChoice.code
             Cpu6502.BreakpointResultAction()
         }
         val ram = Ram(0, 0xffff)