CHANGELOG.md

@@ -1,13 +1,5 @@
 # Changelog
 
-## 0.7.3
-
-* Versions
-  * `Kotlin`: `1.6.21`
-* Several bug fixes ([#27](https://github.com/InsanusMokrassar/krontab/issues/27), [#34](https://github.com/InsanusMokrassar/krontab/issues/34))
-* New factories for `KronScheduler` and `KronSchedulerTz` (fix of [#35](https://github.com/InsanusMokrassar/krontab/issues/35))
-* Fill extensions for flow with time zones (fix of [#33](https://github.com/InsanusMokrassar/krontab/issues/33))
-
 ## 0.7.2
 
 * Versions

README.md

@@ -4,13 +4,6 @@
  [![Build Status](https://github.com/InsanusMokrassar/krontab/actions/workflows/publishing_packages.yml/badge.svg)](https://github.com/InsanusMokrassar/krontab/actions/workflows/publishing_packages.yml)
  [![KDocs](https://raw.githubusercontent.com/InsanusMokrassar/badges/master/kdocs.svg)](https://krontab.inmo.dev/index.html)
  
- ![JVM](https://img.shields.io/badge/JVM-red?style=for-the-badge&logo=openjdk&logoColor=white)
-![Android](https://img.shields.io/badge/Android-green?style=for-the-badge&logo=android&logoColor=white)
-![Js](https://img.shields.io/badge/JavaScript-323330?style=for-the-badge&logo=javascript&logoColor=F7DF1E)
-
-[![KDocs](https://img.shields.io/badge/KDocs-323330?style=for-the-badge&logo=Kotlin&logoColor=7F52FF)](https://krontab.inmo.dev/index.html)
-[![Tutorials](https://img.shields.io/badge/Tutorials-0288D1?style=for-the-badge&logo=bookstack&logoColor=white)](https://bookstack.inmo.dev/books/krontab)
- 
 Library was created to give oppotunity to launch some things from time to time according to some schedule in
 runtime of applications.
 

gradle.properties

@@ -8,10 +8,10 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.6.21
+kotlin_version=1.6.10
 kotlin_coroutines_version=1.6.1
 
-dokka_version=1.6.21
+dokka_version=1.6.10
 
 klockVersion=2.7.0
 
@@ -33,5 +33,5 @@ androidx_work_version=2.7.1
 
 ## Common
 
-version=0.7.3
+version=0.7.2
-android_code_version=14
+android_code_version=13

src/commonMain/kotlin/dev/inmo/krontab/LambdaKronScheduler.kt

@@ -1,13 +0,0 @@
-package dev.inmo.krontab
-
-import com.soywiz.klock.DateTime
-
-class LambdaKronScheduler(
-    private val onNext: suspend (DateTime) -> DateTime?
-) : KronScheduler {
-    override suspend fun next(relatively: DateTime): DateTime? = onNext(relatively)
-}
-
-fun KronScheduler(
-    onNext: suspend (DateTime) -> DateTime?
-) = LambdaKronScheduler(onNext)

src/commonMain/kotlin/dev/inmo/krontab/LambdaKronSchedulerTz.kt

@@ -1,13 +0,0 @@
-package dev.inmo.krontab
-
-import com.soywiz.klock.DateTimeTz
-
-class LambdaKronSchedulerTz(
-    private val onNext: suspend (DateTimeTz) -> DateTimeTz?
-) : KronSchedulerTz {
-    override suspend fun next(relatively: DateTimeTz): DateTimeTz? = onNext(relatively)
-}
-
-fun KronSchedulerTz(
-    onNext: suspend (DateTimeTz) -> DateTimeTz?
-) = LambdaKronSchedulerTz(onNext)

src/commonMain/kotlin/dev/inmo/krontab/StringParser.kt

@@ -57,13 +57,13 @@ typealias KrontabTemplate = String
  * * "0/5,L * * * *" for every five seconds triggering and on 59 second
  * * "0/15 30 * * *" for every 15th seconds in a half of each hour
  * * "0/15 30 * * * 500ms" for every 15th seconds in a half of each hour when milliseconds equal to 500
- * * "1 2 3 F,4,L 5" for triggering in near first second of second minute of third hour of first, fifth and last days of may
+ * * "1 2 3 F,4,L 5" for triggering in near first second of second minute of third hour of fourth day of may
- * * "1 2 3 F,4,L 5 60o" for triggering in near first second of second minute of third hour of first, fifth and last days of may with timezone UTC+01:00
+ * * "1 2 3 F,4,L 5 60o" for triggering in near first second of second minute of third hour of fourth day of may with timezone UTC+01:00
- * * "1 2 3 F,4,L 5 60o 0-2w" for triggering in near first second of second minute of third hour of first, fifth and last days of may in case if it will be in Sunday-Tuesday week days with timezone UTC+01:00
+ * * "1 2 3 F,4,L 5 60o 0-2w" for triggering in near first second of second minute of third hour of fourth day of may in case if it will be in Sunday-Tuesday week days with timezone UTC+01:00
- * * "1 2 3 F,4,L 5 2021" for triggering in near first second of second minute of third hour of first, fifth and last days of may of 2021st year
+ * * "1 2 3 F,4,L 5 2021" for triggering in near first second of second minute of third hour of fourth day of may of 2021st year
- * * "1 2 3 F,4,L 5 2021 60o" for triggering in near first second of second minute of third hour of first, fifth and last days of may of 2021st year with timezone UTC+01:00
+ * * "1 2 3 F,4,L 5 2021 60o" for triggering in near first second of second minute of third hour of fourth day of may of 2021st year with timezone UTC+01:00
- * * "1 2 3 F,4,L 5 2021 60o 0-2w" for triggering in near first second of second minute of third hour of first, fifth and last days of may of 2021st year if it will be in Sunday-Tuesday week days with timezone UTC+01:00
+ * * "1 2 3 F,4,L 5 2021 60o 0-2w" for triggering in near first second of second minute of third hour of fourth day of may of 2021st year if it will be in Sunday-Tuesday week days with timezone UTC+01:00
- * * "1 2 3 F,4,L 5 2021 60o 0-2w 500ms" for triggering in near first second of second minute of third hour of first, fifth and last days of may of 2021st year if it will be in Sunday-Tuesday week days with timezone UTC+01:00 when milliseconds will be equal to 500
+ * * "1 2 3 F,4,L 5 2021 60o 0-2w 500ms" for triggering in near first second of second minute of third hour of fourth day of may of 2021st year if it will be in Sunday-Tuesday week days with timezone UTC+01:00 when milliseconds will be equal to 500
  *
  * @return In case when offset parameter is absent in [incoming] will be used [createSimpleScheduler] method and
  * returned [CronDateTimeScheduler]. In case when offset parameter there is in [incoming] [KrontabTemplate] will be used

src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTime.kt

@@ -8,7 +8,7 @@ import dev.inmo.krontab.KronScheduler
  * @param daysOfWeek 0-6
  * @param years any int
  * @param months 0-11
- * @param daysOfMonth 0-30
+ * @param daysOfMonth 0-31
  * @param hours 0-23
  * @param minutes 0-59
  * @param seconds 0-59

src/commonMain/kotlin/dev/inmo/krontab/internal/NearDateTimeCalculator.kt

@@ -101,14 +101,13 @@ internal fun NearDateTimeCalculatorDays(
     times: Array<Byte>
 ) = CommonNearDateTimeCalculator(
     times,
-    { (it.dayOfMonth - 1).toByte() }, // index1, so, decrease
+    { it.dayOfMonth.toByte() },
     { dateTime, newOne ->
-        val dateTime = (if (newOne < dateTime.dayOfMonth) {
+        (if (newOne < dateTime.dayOfMonth) {
             dateTime.plus(1.months)
         } else {
             dateTime
-        })
+        }).copy(
-        dateTime.copy(
             dayOfMonth = min(dateTime.month.days(dateTime.year), newOne.toInt() + 1), // index1
             hour = 0,
             minute = 0,
@@ -122,7 +121,7 @@ internal fun NearDateTimeCalculatorMonths(
     times: Array<Byte>
 ) = CommonNearDateTimeCalculator(
     times,
-    { it.month0.toByte() },
+    { it.dayOfMonth.toByte() },
     { dateTime, newOne ->
         (if (newOne < dateTime.month0) {
             dateTime.plus(1.years)

src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeTzFilters.kt

@@ -1,34 +0,0 @@
-package dev.inmo.krontab.utils.flows
-
-import com.soywiz.klock.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filter
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterSeconds(vararg seconds: Int) = filter { it.seconds in seconds }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterMinutes(vararg minutes: Int) = filter { it.minutes in minutes }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterHours(vararg hours: Int) = filter { it.hours in hours }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterDaysOfMonths(vararg daysOfMonths: Int) = filter { it.dayOfMonth in daysOfMonths }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterMonths(vararg months: Month) = filter { it.month in months }
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterMonths0(vararg months: Int) = filter { it.month0 in months }
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterMonths1(vararg months: Int) = filter { it.month1 in months }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterYears(year: Year) = filter { it.year == year }
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterYears(vararg years: Int) = filter { it.yearInt in years }
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterWeekDays(vararg weekDays: DayOfWeek) = filter { it.dayOfWeek in weekDays }
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.filterWeekDays(vararg weekDays: Int) = filter { it.dayOfWeekInt in weekDays }

src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeWhen.kt

@@ -1,25 +0,0 @@
-package dev.inmo.krontab.utils.flows
-
-import com.soywiz.klock.*
-import kotlinx.coroutines.flow.Flow
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfMinutes() = filterSeconds(0)
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfHours() = filterMinutes(0).onlyStartsOfMinutes()
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfDays() = filterHours(0).onlyStartsOfHours()
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfMondays() = filterWeekDays(DayOfWeek.Monday).onlyStartsOfDays()
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfSundays() = filterWeekDays(DayOfWeek.Sunday).onlyStartsOfDays()
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfMonths() = filterDaysOfMonths(1).onlyStartsOfDays()
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Flow<DateTimeTz>.onlyStartsOfYears() = filterMonths(Month.January).onlyStartsOfMonths()

src/commonTest/kotlin/dev/inmo/krontab/utils/CheckMonthsAndDaysCorrectWork.kt

@@ -1,22 +0,0 @@
-package dev.inmo.krontab.utils
-
-import com.soywiz.klock.DateTime
-import com.soywiz.klock.days
-import dev.inmo.krontab.buildSchedule
-import kotlin.test.*
-
-class CheckMonthsAndDaysCorrectWork {
-    @Test
-    fun checkMonthsAndDaysCorrectWork() {
-        val now = DateTime.now().startOfYear.startOfDay
-        for (i in 0 until now.year.days) {
-            val scheduleDateTime = (now + i.days)
-            runTest {
-                assertEquals(
-                    scheduleDateTime,
-                    buildSchedule("0 0 0 ${scheduleDateTime.dayOfMonth - 1} ${scheduleDateTime.month0}").next(now)
-                )
-            }
-        }
-    }
-}