From c41ec4566a27fcda9cb2715dfce1d99fdaa51667 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sun, 6 Jun 2021 19:27:13 +0200 Subject: [PATCH 1/3] run the ci on java 16 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c78bee2..0dd9616a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] - java: [ 8, 11, 14 ] + java: [ 8, 11, 16 ] runs-on: ${{ matrix.os }} timeout-minutes: 20 steps: From ac944412c0234a93bf346568aaf916c419ce26cb Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sun, 6 Jun 2021 19:28:14 +0200 Subject: [PATCH 2/3] enable dependency locking relates to https://youtrack.jetbrains.com/issue/KT-43917 --- build.gradle.kts | 5 +++++ gradle.lockfile | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 gradle.lockfile diff --git a/build.gradle.kts b/build.gradle.kts index f7885e7e..055b708c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,8 +80,13 @@ val dependencyVersions = listOf( val dependencyGroupVersions = mapOf() +dependencyLocking { + lockMode.set(LockMode.STRICT) +} + configurations.all { resolutionStrategy { + activateDependencyLocking() failOnVersionConflict() force(dependencyVersions) eachDependency { diff --git a/gradle.lockfile b/gradle.lockfile new file mode 100644 index 00000000..243290b8 --- /dev/null +++ b/gradle.lockfile @@ -0,0 +1,46 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.2.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +ch.qos.logback:logback-core:1.2.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +com.beust:klaxon:5.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.re2j:re2j:1.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.squareup.moshi:moshi-kotlin:1.12.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.squareup.moshi:moshi:1.12.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.squareup.okio:okio-metadata:2.10.0=implementationDependenciesMetadata,testImplementationDependenciesMetadata +com.squareup.okio:okio:2.10.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.github.classgraph:classgraph:4.8.37=testRuntimeClasspath +io.github.microutils:kotlin-logging-jvm:2.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.microutils:kotlin-logging:2.0.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.72=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.3.72=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.3.72=kotlinCompilerClasspath,kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.3.72=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.72=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.3.72=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.72=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test-common:1.3.72=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test:1.3.72=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.3=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1=kotlinCompilerPluginClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3=testRuntimeClasspath +org.jetbrains:annotations:13.0=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.7.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.7.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-launcher:1.7.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.7.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.opentest4j:opentest4j:1.2.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.slf4j:slf4j-api:1.7.25=testRuntimeOnlyDependenciesMetadata +org.slf4j:slf4j-api:1.7.30=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.spekframework.spek2:spek-dsl-jvm:2.0.15=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.spekframework.spek2:spek-runner-junit5:2.0.15=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.spekframework.spek2:spek-runtime-jvm:2.0.15=testRuntimeClasspath +org.yaml:snakeyaml:1.28=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +empty=annotationProcessor,apiDependenciesMetadata,compile,compileOnly,compileOnlyDependenciesMetadata,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,signatures,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime From 4391b1fb73f5ab9b9afe2c928edcda19e786527c Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sun, 6 Jun 2021 19:31:10 +0200 Subject: [PATCH 3/3] update to Kotlin 1.4.31 --- build.gradle.kts | 3 +-- gradle.lockfile | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 055b708c..442273e3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,7 @@ import java.util.* val kotlinVersion = plugins.getPlugin(KotlinPluginWrapper::class.java).kotlinPluginVersion plugins { -// kotlin("jvm") version "1.4.31" - kotlin("jvm") version "1.3.72" + kotlin("jvm") version "1.4.31" id("maven-publish") id("signing") id("com.github.ben-manes.versions") version "0.39.0" diff --git a/gradle.lockfile b/gradle.lockfile index 243290b8..7d9b3b8c 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -14,20 +14,20 @@ io.github.microutils:kotlin-logging-jvm:2.0.8=compileClasspath,runtimeClasspath, io.github.microutils:kotlin-logging:2.0.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.72=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.3.72=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-script-runtime:1.3.72=kotlinCompilerClasspath,kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-scripting-common:1.3.72=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.72=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.3.72=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.72=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.3.72=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-test-common:1.3.72=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-test:1.3.72=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.31=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.31=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.4.31=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.4.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.4.31=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.31=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.31=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.4.31=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test-common:1.4.31=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test:1.4.31=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.3=testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1=kotlinCompilerPluginClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3=testRuntimeClasspath