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) - } - } -}