From 67c8bc6cdd421262c4f59ce03506463a830af6e6 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Mon, 12 Feb 2018 14:02:21 +0100 Subject: refactor(#18): Update dependencies This change bumps the version of the dependencies used by the project. --- opendc-core/build.gradle | 7 ++----- opendc-kernel-omega/build.gradle | 8 +++++--- opendc-model-odc/core/build.gradle | 6 ++++-- opendc-model-odc/jpa/build.gradle | 4 +++- opendc-model-odc/setup/build.gradle | 2 +- opendc-stdlib/build.gradle | 6 ++++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/opendc-core/build.gradle b/opendc-core/build.gradle index f1eac0da..4a45b911 100644 --- a/opendc-core/build.gradle +++ b/opendc-core/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { @@ -35,7 +35,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC3' + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.3' } } @@ -77,11 +77,8 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" - compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.21" testCompile "org.junit.jupiter:junit-jupiter-api:5.0.0-RC3" testRuntime "org.junit.jupiter:junit-jupiter-engine:5.0.0-RC3" testCompile "org.junit.platform:junit-platform-launcher:1.0.0-RC3" - testCompile "org.slf4j:slf4j-simple:1.7.25" } diff --git a/opendc-kernel-omega/build.gradle b/opendc-kernel-omega/build.gradle index ea463f5a..1ca00aa6 100644 --- a/opendc-kernel-omega/build.gradle +++ b/opendc-kernel-omega/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { @@ -35,7 +35,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC3' + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.3' } } @@ -76,7 +76,9 @@ repositories { } dependencies { - compile project(':opendc-core') + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.2" + compile project(':opendc-core') compile "io.github.microutils:kotlin-logging:1.4.6" testCompile "org.junit.jupiter:junit-jupiter-api:5.0.0-RC3" diff --git a/opendc-model-odc/core/build.gradle b/opendc-model-odc/core/build.gradle index c8336196..ffd37db6 100644 --- a/opendc-model-odc/core/build.gradle +++ b/opendc-model-odc/core/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { @@ -35,7 +35,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC3' + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.3' } } @@ -76,6 +76,8 @@ repositories { } dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile project(':opendc-core') compile project(':opendc-stdlib') compile "io.github.microutils:kotlin-logging:1.4.6" diff --git a/opendc-model-odc/jpa/build.gradle b/opendc-model-odc/jpa/build.gradle index 819ef735..d312f89d 100644 --- a/opendc-model-odc/jpa/build.gradle +++ b/opendc-model-odc/jpa/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { @@ -78,6 +78,8 @@ repositories { } dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile project(':opendc-core') compile project(':opendc-stdlib') compile project(':opendc-model-odc:core') diff --git a/opendc-model-odc/setup/build.gradle b/opendc-model-odc/setup/build.gradle index 042b8f37..3962018e 100644 --- a/opendc-model-odc/setup/build.gradle +++ b/opendc-model-odc/setup/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { diff --git a/opendc-stdlib/build.gradle b/opendc-stdlib/build.gradle index ea463f5a..6dccaff0 100644 --- a/opendc-stdlib/build.gradle +++ b/opendc-stdlib/build.gradle @@ -24,7 +24,7 @@ /* Build configuration */ buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.21' ext.dokka_version = '0.9.15' repositories { @@ -35,7 +35,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC3' + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.3' } } @@ -76,6 +76,8 @@ repositories { } dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.2" compile project(':opendc-core') compile "io.github.microutils:kotlin-logging:1.4.6" -- cgit v1.2.3