From 15e3430a55b812c30f02a0d1a5ae7a7f5000c5f2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 7 May 2021 13:33:35 +0600 Subject: [PATCH] update dependencies --- CHANGELOG.md | 5 +++++ build.gradle | 6 +----- gradle.properties | 10 +++++----- .../kotlin/dev/inmo/krontab/utils/StringParseTest.kt | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f096b4..997606b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.6.0 +* Versions + * `Kotlin`: `1.4.32` -> `1.5.0` + * `Coroutines`: `1.4.3` -> `1.5.0-RC` + * `Klock`: `2.0.7` -> `2.1.0` + ## 0.5.2 * Versions diff --git a/build.gradle b/build.gradle index 6ab9cc0..f3e83c8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version" - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:4.1.3' } } @@ -125,10 +125,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - sourceSets { main.java.srcDirs += 'src/main/kotlin' test { diff --git a/gradle.properties b/gradle.properties index 63db3ac..634b2ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=1.4.32 -kotlin_coroutines_version=1.4.3 +kotlin_version=1.5.0 +kotlin_coroutines_version=1.5.0-RC -dokka_version=1.4.30 +dokka_version=1.4.32 -klockVersion=2.0.7 +klockVersion=2.1.0 ## Github reease @@ -23,7 +23,7 @@ github_release_plugin_version=2.2.12 android_minSdkVersion=19 android_compileSdkVersion=30 -android_buildToolsVersion=30.0.2 +android_buildToolsVersion=30.0.3 dexcount_version=2.0.0 junit_version=4.12 test_ext_junit_version=1.1.2 diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt b/src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt index 108c278..0ddc638 100644 --- a/src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt +++ b/src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt @@ -68,7 +68,7 @@ class StringParseTest { runTest { val ranges = rangesEnds.map { it.first .. it.second }.flatten().toMutableList() - val expectedCollects = rangesEnds.sumBy { it.second - it.first + 1 } + val expectedCollects = rangesEnds.sumOf { it.second - it.first + 1 } var collected = 0 flow.takeWhile { ranges.isNotEmpty() }.collect {