From ee60554c0e3cb5e8fdf265c8c24ac6be783a9ab0 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 15 Sep 2019 01:50:35 +0200
Subject: [PATCH] ide settings and build config

---
 .idea/$PRODUCT_WORKSPACE_FILE$      |  2 +-
 .idea/.gitignore                    |  2 --
 .idea/gradle.xml                    |  2 +-
 .idea/modules.xml                   |  9 +++++++++
 .idea/vcs.xml                       |  2 +-
 build.gradle.kts                    | 18 +++++-------------
 src/test/kotlin/TestDisassembler.kt |  2 +-
 7 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 .idea/.gitignore
 create mode 100644 .idea/modules.xml

diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
index 6eadb35..3733e0d 100644
--- a/.idea/$PRODUCT_WORKSPACE_FILE$
+++ b/.idea/$PRODUCT_WORKSPACE_FILE$
@@ -4,7 +4,7 @@
     <states>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>Python 3.7 (py3)</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 6437983..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project exclude paths
-/.
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6b01531..37e5426 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,12 +9,12 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/share/java/gradle" />
+        <option name="gradleJvm" value="openjdk-11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="useAutoImport" value="true" />
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ff0e2e3
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ksim65.main.iml" filepath="$PROJECT_DIR$/.idea/modules/ksim65.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ksim65.test.iml" filepath="$PROJECT_DIR$/.idea/modules/ksim65.test.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 9da5be5..dfeadde 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,17 +6,17 @@ import java.util.Properties
 
 plugins {
     // Apply the Kotlin JVM plugin to add support for Kotlin on the JVM.
-    id("org.jetbrains.kotlin.jvm") version "1.3.50"
-    id("com.gradle.build-scan") version "2.4.2"
+    kotlin("jvm") version "1.3.50"
     id("org.jetbrains.dokka") version "0.9.18"
     id("com.jfrog.bintray") version "1.7.3"
     id("maven-publish")
 }
 
 val versionProps = Properties().also {
-    it.load(File("src/main/resources/version.properties").inputStream())
+    it.load(File("$projectDir/src/main/resources/version.properties").inputStream())
 }
 version = versionProps["version"] as String
+group = "net.razorvine"
 base.archivesBaseName = "ksim65"
 
 repositories {
@@ -39,12 +39,6 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.1.0")
 }
 
-//buildScan {
-//    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-//    termsOfServiceAgree="yes"
-//    publishOnFailure()
-//}
-
 tasks.named<Test>("test") {
     // Enable JUnit 5 (Gradle 4.6+).
     useJUnitPlatform()
@@ -59,10 +53,8 @@ tasks.named<Test>("test") {
     maxParallelForks = max(1, Runtime.getRuntime().availableProcessors() / 2)
 }
 
-tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+tasks.withType<KotlinCompile>() {
+    kotlinOptions.jvmTarget = "1.8"
 }
 
 tasks.named<DokkaTask>("dokka") {
diff --git a/src/test/kotlin/TestDisassembler.kt b/src/test/kotlin/TestDisassembler.kt
index c362765..914338e 100644
--- a/src/test/kotlin/TestDisassembler.kt
+++ b/src/test/kotlin/TestDisassembler.kt
@@ -10,7 +10,7 @@ class TestDisassembler {
     fun testDisassembleAll6502Opcodes() {
         val cpu = Cpu6502()
         val memory = Ram(0, 0xffff)
-        val binfile = javaClass.classLoader.getResourceAsStream("disassem_instr_test.prg")?.readAllBytes()!!
+        val binfile = javaClass.classLoader.getResourceAsStream("disassem_instr_test.prg")?.readBytes()!!
         memory.load(binfile, 0x1000-2)
         val result = cpu.disassemble(memory, 0x1000, 0x1221)
         assertEquals(256, result.size)