1
0
mirror of https://github.com/irmen/ksim65.git synced 2024-06-09 11:29:30 +00:00

ide settings and build config

This commit is contained in:
Irmen de Jong 2019-09-15 01:50:35 +02:00
parent 9ec77a81b4
commit ee60554c0e
7 changed files with 18 additions and 19 deletions

View File

@ -4,7 +4,7 @@
<states> <states>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<last-edited>Python 3.7 (py3)</last-edited> <last-edited>1.8</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>

2
.idea/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Project exclude paths
/.

View File

@ -9,12 +9,12 @@
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/share/java/gradle" /> <option name="gradleHome" value="/usr/share/java/gradle" />
<option name="gradleJvm" value="openjdk-11" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
</set> </set>
</option> </option>
<option name="useAutoImport" value="true" />
<option name="useQualifiedModuleNames" value="true" /> <option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>

9
.idea/modules.xml Normal file
View File

@ -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>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

View File

@ -6,17 +6,17 @@ import java.util.Properties
plugins { plugins {
// Apply the Kotlin JVM plugin to add support for Kotlin on the JVM. // Apply the Kotlin JVM plugin to add support for Kotlin on the JVM.
id("org.jetbrains.kotlin.jvm") version "1.3.50" kotlin("jvm") version "1.3.50"
id("com.gradle.build-scan") version "2.4.2"
id("org.jetbrains.dokka") version "0.9.18" id("org.jetbrains.dokka") version "0.9.18"
id("com.jfrog.bintray") version "1.7.3" id("com.jfrog.bintray") version "1.7.3"
id("maven-publish") id("maven-publish")
} }
val versionProps = Properties().also { 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 version = versionProps["version"] as String
group = "net.razorvine"
base.archivesBaseName = "ksim65" base.archivesBaseName = "ksim65"
repositories { repositories {
@ -39,12 +39,6 @@ dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.1.0") 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") { tasks.named<Test>("test") {
// Enable JUnit 5 (Gradle 4.6+). // Enable JUnit 5 (Gradle 4.6+).
useJUnitPlatform() useJUnitPlatform()
@ -59,10 +53,8 @@ tasks.named<Test>("test") {
maxParallelForks = max(1, Runtime.getRuntime().availableProcessors() / 2) maxParallelForks = max(1, Runtime.getRuntime().availableProcessors() / 2)
} }
tasks.withType<KotlinCompile>().all { tasks.withType<KotlinCompile>() {
kotlinOptions { kotlinOptions.jvmTarget = "1.8"
jvmTarget = "1.8"
}
} }
tasks.named<DokkaTask>("dokka") { tasks.named<DokkaTask>("dokka") {

View File

@ -10,7 +10,7 @@ class TestDisassembler {
fun testDisassembleAll6502Opcodes() { fun testDisassembleAll6502Opcodes() {
val cpu = Cpu6502() val cpu = Cpu6502()
val memory = Ram(0, 0xffff) 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) memory.load(binfile, 0x1000-2)
val result = cpu.disassemble(memory, 0x1000, 0x1221) val result = cpu.disassemble(memory, 0x1000, 0x1221)
assertEquals(256, result.size) assertEquals(256, result.size)