CHANGELOG.md

@@ -1,41 +1,5 @@
 # Changelog
 
-## 2.3.0
-
-* `doWhile` now will guarantee that it will not call `doOnce` more than once for time
-
-## 2.2.9
-
-* `Version`:
-  * `Kotlin`: `1.9.23`
-  * `Serialization`: `1.6.3`
-  * `Klock`: `5.3.2`
-* Fixes in build-in schedulers
-
-## 2.2.8
-
-* `Version`:
-  * `Coroutines`: `1.8.0`
-
-## 2.2.7
-
-* `Version`:
-  * `Klock`: `5.3.1`
-  * `AndroidXWork`: `2.9.0`
-
-## 2.2.6
-
-**Since this version klock depdendency replaced with `com.soywiz.korge:korlibs-time`**
-
-* `Version`:
-  * `Klock`: `5.3.0`
-
-## 2.2.5
-
-* `Versions`
-  * `Kotlin`: `1.9.22`
-  * `Serialization`: `1.6.2`
-
 ## 2.2.4
 
 * `Versions`

build.gradle

@@ -71,7 +71,7 @@ kotlin {
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialization_version"
 
-                api "com.soywiz.korge:korlibs-time:$klockVersion"
+                api "com.soywiz.korlibs.klock:klock:$klockVersion"
             }
         }
 

github_release.gradle

@@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
     githubRelease {
         token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
-        owner = "InsanusMokrassar"
-        repo = "${rootProject.name}"
+        owner "InsanusMokrassar"
+        repo "${rootProject.name}"
 
-        tagName = "v${project.version}"
-        releaseName = "${project.version}"
-        targetCommitish = "${project.version}"
+        tagName "v${project.version}"
+        releaseName "${project.version}"
+        targetCommitish "${project.version}"
 
-        body = getCurrentVersionChangelog("${project.version}")
+        body getCurrentVersionChangelog("${project.version}")
     }
 }

gradle.properties

@@ -9,21 +9,21 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.9.23
-kotlin_coroutines_version=1.8.0
-kotlin_serialization_version=1.6.3
+kotlin_version=1.9.21
+kotlin_coroutines_version=1.7.3
+kotlin_serialization_version=1.6.1
 
-dokka_version=1.9.20
+dokka_version=1.9.10
 
-klockVersion=5.4.0
+klockVersion=4.0.10
 
 ## Github reease
 
-github_release_plugin_version=2.5.2
+github_release_plugin_version=2.4.1
 
 ## Android
 
-android_gradle_version=8.1.4
+android_gradle_version=8.1.2
 android_minSdkVersion=21
 android_compileSdkVersion=34
 android_buildToolsVersion=34.0.0
@@ -32,9 +32,9 @@ junit_version=4.12
 test_ext_junit_version=1.1.3
 espresso_core=3.4.0
 
-androidx_work_version=2.9.0
+androidx_work_version=2.8.1
 
 ## Common
 
-version=2.3.0
-android_code_version=40
+version=2.2.4
+android_code_version=34

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-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

publish.gradle

@@ -50,14 +50,18 @@ publishing {
             
                 }
             }
-            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                 maven {
-                    name = "InmoNexus"
-                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
             
-                    credentials {
-                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
                     }
             
                 }
@@ -98,21 +102,4 @@ if (project.hasProperty("signing.gnupg.keyName")) {
         def signingTasks = project.getTasks().withType(Sign.class)
         mustRunAfter(signingTasks)
     }
-    // Workaround to make test tasks use sign
-    project.getTasks().withType(Sign.class).configureEach { signTask ->
-        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
-        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
-        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
-
-        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
-        if (debugTestTask != null) {
-            signTask.mustRunAfter(debugTestTask)
-        }
-        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def testTask = tasks.findByName("compileTestKotlin$pubName")
-        if (testTask != null) {
-            signTask.mustRunAfter(testTask)
-        }
-    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

src/androidMain/kotlin/KronSchedulerWork.kt

@@ -3,7 +3,6 @@ package dev.inmo.krontab
 import android.content.Context
 import androidx.work.*
 import korlibs.time.DateTime
-import korlibs.time.millisecondsLong
 import java.util.concurrent.TimeUnit
 
 /**

src/commonMain/kotlin/Executes.kt

@@ -2,7 +2,6 @@ package dev.inmo.krontab
 
 import korlibs.time.DateTime
 import korlibs.time.DateTimeTz
-import korlibs.time.millisecondsLong
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlin.coroutines.coroutineContext
@@ -71,18 +70,9 @@ suspend inline fun <T> doOnceTz(
  * Will execute [block] while it will return true as a result of its calculation
  */
 suspend inline fun KronScheduler.doWhile(block: (DateTime) -> Boolean) {
-    var latest: DateTime? = null
     do {
         delay(1L)
-        val result = doOnce {
-            if (latest != it) {
-                latest = it
-                block(it)
-            } else {
-                null
-            }
-        }
-    } while (result == null || result)
+    } while (doOnce(block))
 }
 /**
  * Will execute [block] while it will return true as a result of its calculation
@@ -94,18 +84,9 @@ suspend inline fun KronScheduler.doWhileLocal(block: (DateTime) -> Boolean) = do
  * Will execute [block] while it will return true as a result of its calculation
  */
 suspend inline fun KronScheduler.doWhileTz(noinline block: suspend (DateTimeTz) -> Boolean) {
-    var latest: DateTimeTz? = null
     do {
         delay(1L)
-        val result = doOnceTz {
-            if (latest != it) {
-                latest = it
-                block(it)
-            } else {
-                null
-            }
-        }
-    } while (result == null || result)
+    } while (doOnceTz(block))
 }
 
 /**

src/commonMain/kotlin/SchedulerShortcuts.kt

@@ -34,60 +34,35 @@ val EverySecondScheduler: KronScheduler by lazy {
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one minute
  */
 val EveryMinuteScheduler: KronScheduler by lazy {
-    buildSchedule {
-        seconds { at(0) }
-        minutes { 0 every 1 }
-    }
+    buildSchedule { minutes { 0 every 1 } }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one hour
  */
 val EveryHourScheduler: KronScheduler by lazy {
-    buildSchedule {
-        seconds { at(0) }
-        minutes { at(0) }
-        hours { 0 every 1 }
-    }
+    buildSchedule { hours { 0 every 1 } }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one day
  */
 val EveryDayOfMonthScheduler: KronScheduler by lazy {
-    buildSchedule {
-        seconds { at(0) }
-        minutes { at(0) }
-        hours { at(0) }
-        dayOfMonth { 0 every 1 }
-    }
+    buildSchedule { dayOfMonth { 0 every 1 } }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one month
  */
 val EveryMonthScheduler: KronScheduler by lazy {
-    buildSchedule {
-        seconds { at(0) }
-        minutes { at(0) }
-        hours { at(0) }
-        dayOfMonth { at(0) }
-        months { 0 every 1 }
-    }
+    buildSchedule { months { 0 every 1 } }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one year
  */
 val EveryYearScheduler: KronScheduler by lazy {
-    buildSchedule {
-        seconds { at(0) }
-        minutes { at(0) }
-        hours { at(0) }
-        dayOfMonth { at(0) }
-        months { at(0) }
-        years { 0 every 1 }
-    }
+    buildSchedule { years { 0 every 1 } }
 }
 
 /**

src/commonMain/kotlin/builder/SchedulerBuilder.kt

@@ -182,24 +182,15 @@ class SchedulerBuilder(
      */
     fun build(): KronScheduler = offset ?.let {
         createKronSchedulerWithOffset(
-            seconds = seconds,
-            minutes = minutes,
-            hours = hours,
-            dayOfMonth = dayOfMonth,
-            month = month,
-            years = year,
-            weekDays = dayOfWeek,
-            offset = TimezoneOffset(it.minutes),
-            milliseconds = milliseconds ?: millisecondsArrayDefault
+            seconds,
+            minutes,
+            hours,
+            dayOfMonth,
+            month,
+            year,
+            dayOfWeek,
+            TimezoneOffset(it.minutes),
+            milliseconds ?: millisecondsArrayDefault
         )
-    } ?: createKronScheduler(
-        seconds = seconds,
-        minutes = minutes,
-        hours = hours,
-        dayOfMonth = dayOfMonth,
-        month = month,
-        years = year,
-        weekDays = dayOfWeek,
-        milliseconds = milliseconds ?: millisecondsArrayDefault
-    )
+    } ?: createKronScheduler(seconds, minutes, hours, dayOfMonth, month, year, dayOfWeek, milliseconds ?: millisecondsArrayDefault)
 }

src/commonMain/kotlin/utils/SchedulerFlow.kt

@@ -5,7 +5,6 @@ import korlibs.time.DateTimeTz
 import korlibs.time.milliseconds
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.next
-import korlibs.time.millisecondsLong
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow

src/commonTest/kotlin/BuildersTest.kt

@@ -1,38 +0,0 @@
-package dev.inmo.krontab.utils
-
-import dev.inmo.krontab.*
-import korlibs.time.*
-import kotlinx.coroutines.test.runTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
-
-class BuildersTest {
-    @Test
-    fun presetsWorksCorrectly() {
-        val data = mapOf(
-            EverySecondScheduler to { it: DateTime -> if (it.milliseconds > 0 ) it + 1.seconds - it.milliseconds.milliseconds else it },
-            EveryMinuteScheduler to { it: DateTime -> if (it.seconds > 0 || it.milliseconds > 0 ) it + 1.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
-            EveryHourScheduler to { it: DateTime -> if (it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
-            EveryDayOfMonthScheduler to { it: DateTime -> if (it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.days - it.hours.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
-            EveryMonthScheduler to { it: DateTime -> if (it.dayOfMonth > 1 || it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) (it + 1.months).copy(dayOfMonth = 1, hour = 0, minute = 0, second = 0, milliseconds = 0) else it },
-        )
-        val samples = 10000
-
-        runTest {
-            var now = DateTime.now()
-            for (i in 0 until samples) {
-                data.forEach { (scheduler, expectCalculator) ->
-                    val expectValue = expectCalculator(now)
-                    val newNow = scheduler.nextOrRelative(now)
-
-                    assertEquals(expectValue, newNow, "For time ${now.toStringDefault()} calculated wrong value: ${newNow.toStringDefault()} is not equal to ${expectValue.toStringDefault()}")
-
-                    now = newNow
-                }
-            }
-        }
-    }
-}