From 06107f75f2d5f6578dc4dab0d54772ce80fdb9f4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Nov 2021 18:59:44 +0600 Subject: [PATCH 01/12] start 0.7.0 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4495a28..2fc6919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.7.0 + ## 0.6.6 * Versions diff --git a/gradle.properties b/gradle.properties index b144643..3ee1a44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ androidx_work_version=2.7.0 ## Common -version=0.6.6 -android_code_version=10 +version=0.7.0 +android_code_version=11 From 0bfe022476d3ce23da281597bf00d28565c60c2a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Nov 2021 19:08:24 +0600 Subject: [PATCH 02/12] update dependencies and remove deprecations --- CHANGELOG.md | 7 ++++++ build.gradle | 5 ++-- gradle.properties | 6 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../krontab/internal/CronDateTimeScheduler.kt | 20 ---------------- .../dev/inmo/krontab/utils/SchedulerFlow.kt | 23 +------------------ 6 files changed, 14 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fc6919..f84f7a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.7.0 +**ALL DEPRECATIONS HAVE BEEN REMOVED** + +* Versions + * `Kotlin`: `1.6.0` + * `Coroutines`: `1.6.0-RC` + * `Androidx Work`: `2.7.1` + ## 0.6.6 * Versions diff --git a/build.gradle b/build.gradle index d0dde0b..e404f4a 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,6 @@ android { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/gradle.properties b/gradle.properties index 3ee1a44..2ea757a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,8 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=1.5.31 -kotlin_coroutines_version=1.5.2 +kotlin_version=1.6.0 +kotlin_coroutines_version=1.6.0-RC dokka_version=1.5.31 @@ -29,7 +29,7 @@ junit_version=4.12 test_ext_junit_version=1.1.2 espresso_core=3.3.0 -androidx_work_version=2.7.0 +androidx_work_version=2.7.1 ## Common diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49719ae..63bc668 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt b/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt index 620a5de..4b6d0f2 100644 --- a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt +++ b/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt @@ -36,23 +36,3 @@ internal fun mergeCronDateTimeSchedulers( ): CronDateTimeScheduler = CronDateTimeScheduler( schedulers.map { it.cronDateTime }.merge() ) - -/** - * @return New instance of [CronDateTimeScheduler] with all unique [CronDateTimeScheduler.cronDateTimes] of - * [kronSchedulers] included - */ -@Deprecated("Will be removed in next major release", ReplaceWith("merge", "dev.inmo.krontab")) -fun merge(kronSchedulers: List) = kronSchedulers.apply { dev.inmo.krontab.merge() } - -/** - * @return Vararg shortcut for [dev.inmo.krontab.merge] - */ -@Suppress("NOTHING_TO_INLINE") -@Deprecated("Will be removed in next major release", ReplaceWith("merge", "dev.inmo.krontab")) -inline fun merge(vararg kronDateTimeSchedulers: KronScheduler) = kronDateTimeSchedulers.apply { dev.inmo.krontab.merge() } -/** - * @return Vararg shortcut for [dev.inmo.krontab.merge] - */ -@Suppress("NOTHING_TO_INLINE") -@Deprecated("Will be removed in next major release", ReplaceWith("merge", "dev.inmo.krontab")) -inline fun KronScheduler.plus(other: KronScheduler) = this + other diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt b/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt index 7a1a78d..4ecded9 100644 --- a/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt +++ b/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt @@ -3,8 +3,7 @@ package dev.inmo.krontab.utils import com.soywiz.klock.DateTime import com.soywiz.klock.DateTimeTz import dev.inmo.krontab.* -import kotlinx.coroutines.FlowPreview -import kotlinx.coroutines.delay +import kotlinx.coroutines.* import kotlinx.coroutines.flow.* /** @@ -33,23 +32,3 @@ fun KronScheduler.asFlow(): Flow = channelFlow { send(it) } } - -@Deprecated( - "It is not recommended to use this class in future. This functionality will be removed soon", - ReplaceWith("asFlow", "dev.inmo.krontab.utils.asFlow") -) -@FlowPreview -class SchedulerFlow( - private val scheduler: KronScheduler -) : AbstractFlow() { - @FlowPreview - override suspend fun collectSafely(collector: FlowCollector) { - while (true) { - val now = DateTime.now() - val nextTime = scheduler.next(now) ?: break - val sleepDelay = (nextTime - now).millisecondsLong - delay(sleepDelay) - collector.emit(nextTime) - } - } -} From 3040951f3782b71e478066f9b63fc4c49b30cb81 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Nov 2021 19:09:33 +0600 Subject: [PATCH 03/12] optimize imports --- .../dev/inmo/krontab/internal/CronDateTimeScheduler.kt | 1 - .../kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt b/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt index 4b6d0f2..87dfdc9 100644 --- a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt +++ b/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt @@ -2,7 +2,6 @@ package dev.inmo.krontab.internal import com.soywiz.klock.DateTime import dev.inmo.krontab.KronScheduler -import dev.inmo.krontab.collection.plus /** * Cron-oriented realisation of [KronScheduler] diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt b/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt index 4ecded9..b536f81 100644 --- a/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt +++ b/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt @@ -3,8 +3,9 @@ package dev.inmo.krontab.utils import com.soywiz.klock.DateTime import com.soywiz.klock.DateTimeTz import dev.inmo.krontab.* -import kotlinx.coroutines.* -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.channelFlow /** * This [Flow] will trigger emitting each near time which will be returned from [this] [KronScheduler] with attention to From 83339dc095f0401f4e15f5900e751f8feae2012c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Dec 2021 10:51:49 +0600 Subject: [PATCH 04/12] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2ea757a..4234d41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ android.enableJetifier=false kotlin_version=1.6.0 kotlin_coroutines_version=1.6.0-RC -dokka_version=1.5.31 +dokka_version=1.6.0 klockVersion=2.4.8 From 7799077e446ec20de5a52b3d168810fda1d38faf Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Dec 2021 10:57:26 +0600 Subject: [PATCH 05/12] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63bc668..7adcc0b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip From adf10301dc581a2766d88f65bcc11a6807fa4cd4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Dec 2021 13:37:30 +0600 Subject: [PATCH 06/12] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4234d41..b327fcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ android.enableJetifier=false kotlin_version=1.6.0 -kotlin_coroutines_version=1.6.0-RC +kotlin_coroutines_version=1.6.0-RC2 dokka_version=1.6.0 From aa9c2b8ea0a121c25a2168f9958be19e5d0003d4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Dec 2021 12:52:08 +0600 Subject: [PATCH 07/12] Update gradle.properties --- gradle.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b327fcf..ad55673 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=1.6.0 -kotlin_coroutines_version=1.6.0-RC2 +kotlin_version=1.6.10 +kotlin_coroutines_version=1.6.0-RC3 dokka_version=1.6.0 -klockVersion=2.4.8 +klockVersion=2.4.9 ## Github reease @@ -22,8 +22,8 @@ github_release_plugin_version=2.2.12 ## Android android_minSdkVersion=19 -android_compileSdkVersion=31 -android_buildToolsVersion=31.0.0 +android_compileSdkVersion=32 +android_buildToolsVersion=32.0.0 dexcount_version=3.0.0 junit_version=4.12 test_ext_junit_version=1.1.2 From 8c011ea1fbf55da51765f537ca7a86baaddd7473 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Dec 2021 12:55:22 +0600 Subject: [PATCH 08/12] Update publishing_packages.yml --- .github/workflows/publishing_packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 27989ce..eb9a9dc 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -8,9 +8,9 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Fix android 31.0.0 dx + - name: Fix android 32.0.0 dx continue-on-error: true - run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar + run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar - name: Update version run: | branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" From 4aadf513aa0cd71a031dbe7bfb4e3887faed1e47 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 23 Dec 2021 13:02:47 +0600 Subject: [PATCH 09/12] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ad55673..baa622b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ android.enableJetifier=false kotlin_version=1.6.10 -kotlin_coroutines_version=1.6.0-RC3 +kotlin_coroutines_version=1.6.0 dokka_version=1.6.0 From eb73da67eb98d6d8b473437f06884924416346c3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 23 Dec 2021 13:03:16 +0600 Subject: [PATCH 10/12] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index baa622b..b812f17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ kotlin_coroutines_version=1.6.0 dokka_version=1.6.0 -klockVersion=2.4.9 +klockVersion=2.4.10 ## Github reease From 347cf64cb294ce19af12a0f8323ff062f50c0684 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 24 Dec 2021 17:59:11 +0600 Subject: [PATCH 11/12] Update CHANGELOG.md --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f84f7a3..d82e708 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ **ALL DEPRECATIONS HAVE BEEN REMOVED** * Versions - * `Kotlin`: `1.6.0` - * `Coroutines`: `1.6.0-RC` + * `Kotlin`: `1.6.10` + * `Klock`: `2.4.10` + * `Coroutines`: `1.6.0` * `Androidx Work`: `2.7.1` ## 0.6.6 From 84f1063e3f2a98082c1d030cd9f1fe43fd0a2a9b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 24 Dec 2021 17:59:39 +0600 Subject: [PATCH 12/12] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7adcc0b..1cf8aa1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip