Skip to content

Update to Kotlin 1.4 (enabling Gradle's dependency locking) #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 6, 2021
Merged

Update to Kotlin 1.4 (enabling Gradle's dependency locking) #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41ec45
run the ci on java 16
gesellix Jun 6, 2021
ac94441
enable dependency locking
gesellix Jun 6, 2021
4391b1f
update to Kotlin 1.4.31
gesellix Jun 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 6 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -80,8 +79,13 @@ val dependencyVersions = listOf<String>(

val dependencyGroupVersions = mapOf<String, String>()

dependencyLocking {
lockMode.set(LockMode.STRICT)
}

configurations.all {
resolutionStrategy {
activateDependencyLocking()
failOnVersionConflict()
force(dependencyVersions)
eachDependency {
Expand Down
46 changes: 46 additions & 0 deletions gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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
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