From cdeea96c54c5bfb675e83e87ca47a31ab46b6276 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Aug 2020 21:36:55 +0600 Subject: [PATCH] update dependencies versions --- CHANGELOG.md | 5 +++++ build.gradle | 16 +++++++--------- gradle.properties | 8 ++++---- .../krontab/internal/CronDateTimeScheduler.kt | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0b1d77..0587952 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.3.0 +* Versions: + * `Kotlin`: `1.3.72` -> `1.4.0` + * `Coroutines`: `1.3.8` -> `1.3.9` + * `Klock`: `1.11.14` -> `1.12.0` + ## 0.2.0 * Updated way of publishing (for more info look at the [git](https://git.insanusmokrassar.com/InsanusMokrassar/krontab)) diff --git a/build.gradle b/build.gradle index 83b9c97..54fc0b1 100644 --- a/build.gradle +++ b/build.gradle @@ -7,14 +7,12 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version" } } plugins { id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" - id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" id "org.jetbrains.dokka" version "$dokka_version" } @@ -34,13 +32,17 @@ apply from: './dokka.gradle' kotlin { jvm() - js() + js(BOTH) { + browser() + nodejs() + } + sourceSets { commonMain { dependencies { implementation kotlin('stdlib') - api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" api "com.soywiz.korlibs.klock:klock:$klockVersion" } @@ -49,24 +51,20 @@ kotlin { dependencies { implementation kotlin('test-common') implementation kotlin('test-annotations-common') - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_version" } } jvmMain { dependencies { - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" } } jvmTest { dependencies { implementation kotlin('test-junit') - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" } } jsMain { dependencies { - api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version" + implementation kotlin('test-js') } } } diff --git a/gradle.properties b/gradle.properties index bc62003..36759a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ kotlin.code.style=official -kotlin_version=1.3.72 -kotlin_coroutines_version=1.3.8 +kotlin_version=1.4.0 +kotlin_coroutines_version=1.3.9 dokka_version=0.10.1 -gradle_bintray_plugin_version=1.8.4 +gradle_bintray_plugin_version=1.8.5 -klockVersion=1.11.14 +klockVersion=1.12.0 kotlin.incremental.multiplatform=true diff --git a/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTimeScheduler.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTimeScheduler.kt index 8c96701..627d4c2 100644 --- a/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTimeScheduler.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTimeScheduler.kt @@ -26,7 +26,7 @@ internal data class CronDateTimeScheduler internal constructor( * @see toNearDateTime */ override suspend fun next(relatively: DateTime): DateTime { - return cronDateTimes.map { it.toNearDateTime(relatively) }.min() ?: anyCronDateTime.toNearDateTime(relatively) + return cronDateTimes.map { it.toNearDateTime(relatively) }.minOrNull() ?: anyCronDateTime.toNearDateTime(relatively) } }