From 6812ab4b0906172cdbfb0fcb33885c83e402fec3 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Tue, 15 Aug 2023 13:23:19 +0200 Subject: [PATCH] updates --- .idea/kotlinc.xml | 6 +++++ .travis.yml | 10 --------- README.md | 4 ++-- build.gradle.kts | 28 +++--------------------- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/version.properties | 2 +- 6 files changed, 13 insertions(+), 39 deletions(-) create mode 100644 .idea/kotlinc.xml delete mode 100644 .travis.yml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..fdf8d99 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6af07e5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: java -sudo: false -# jdk: openjdk11 -# dist: xenial - -before_install: - - chmod +x gradlew - -script: - - ./gradlew test diff --git a/README.md b/README.md index 02f4eaa..a013a18 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![saythanks](https://img.shields.io/badge/say-thanks-ff69b4.svg)](https://saythanks.io/to/irmen) [![Build Status](https://travis-ci.org/irmen/ksim65.svg?branch=master)](https://travis-ci.org/irmen/ksim65) -JCenter: [![Download from Jcenter](https://api.bintray.com/packages/irmen/maven/ksim65/images/download.svg)](https://bintray.com/irmen/maven/ksim65/_latestVersion) + # KSim65 - Kotlin/JVM 6502/65C02 microprocessor simulator @@ -30,7 +30,7 @@ Still to be written. For now, use the source ;-) ## Using it as a library in your own project -Ksim65 is available on the [JCenter maven repository](https://bintray.com/irmen/maven/ksim65/_latestVersion). +**TODO move to another repository for published packages.** You can simply add it as a dependency to your project. For Maven: diff --git a/build.gradle.kts b/build.gradle.kts index 94cc2eb..5a49fd7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,11 +5,10 @@ import kotlin.math.max plugins { // Apply the Kotlin JVM plugin to add support for Kotlin on the JVM. - kotlin("jvm") version "1.8.21" + kotlin("jvm") version "1.9.0" `maven-publish` application java - id("com.jfrog.bintray") version "1.8.4" } java { @@ -47,8 +46,8 @@ dependencies { // Use the Kotlin JUnit5 integration. testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") subprojects.forEach { implementation(it) @@ -112,24 +111,3 @@ publishing { } } } - -bintray { - user = System.getenv("BINTRAY_USER") - key = System.getenv("BINTRAY_KEY") - - setPublications(* publishing.publications.names.toTypedArray()) - // setConfigurations("archives") - pkg = PackageConfig().also { - it.name = "ksim65" - it.repo = "maven" - it.setLicenses("MIT") - it.vcsUrl = "https://github.com/irmen/ksim65.git" - it.setLabels("6502", "retro", "emulation", "c64") - it.githubRepo = it.vcsUrl - it.version = VersionConfig().also { vc-> - vc.gpg = GpgConfig().also { gpg-> - gpg.sign = true - } - } - } -} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..84a0b92 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties index fd7bece..ff81b68 100644 --- a/src/main/resources/version.properties +++ b/src/main/resources/version.properties @@ -1 +1 @@ -version=1.9 +version=1.10