Merge pull request #58 from InsanusMokrassar/2.0.0

2.0.0

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.0.0
+
+* Versions
+  * `Kotlin`: `1.8.21`
+  * `Klock`: `4.0.1`
+* Support of `mingwx64` platform
+
 ## 1.0.0
 
 * Versions

build.gradle

@@ -58,6 +58,7 @@ kotlin {
         publishAllLibraryVariants()
     }
     linuxX64()
+    mingwX64()
 
 
     sourceSets {
@@ -104,8 +105,9 @@ kotlin {
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    compileSdkVersion "$android_compileSdkVersion".toInteger()
+    compileSdk "$android_compileSdkVersion".toInteger()
     buildToolsVersion "$android_buildToolsVersion"
+    namespace "${group}.${project.name}"
 
     defaultConfig {
         minSdkVersion "$android_minSdkVersion".toInteger()

gradle.properties

@@ -9,12 +9,12 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.8.20
+kotlin_version=1.8.21
 kotlin_coroutines_version=1.6.4
 
 dokka_version=1.8.10
 
-klockVersion=3.4.0
+klockVersion=4.0.1
 
 ## Github reease
 
@@ -35,5 +35,5 @@ androidx_work_version=2.8.1
 
 ## Common
 
-version=1.0.0
+version=2.0.0
-android_code_version=25
+android_code_version=26

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

@@ -1,7 +1,7 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlin.coroutines.coroutineContext

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 
 /**
  * This interface was created for abstraction of [next] operation. Currently, there is only

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

@@ -1,7 +1,7 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
 
 /**
  * This interface extending [KronScheduler] to use [DateTimeTz] with taking into account offset of incoming time for

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 
 class LambdaKronScheduler(
     private val onNext: suspend (DateTime) -> DateTime?

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
 
 class LambdaKronSchedulerTz(
     private val onNext: suspend (DateTimeTz) -> DateTimeTz?

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.krontab.builder.buildSchedule
 import dev.inmo.krontab.internal.*
 

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

@@ -1,7 +1,7 @@
 package dev.inmo.krontab
 
-import com.soywiz.klock.TimezoneOffset
+import korlibs.time.TimezoneOffset
-import com.soywiz.klock.minutes
+import korlibs.time.minutes
 import dev.inmo.krontab.internal.*
 import dev.inmo.krontab.utils.Minutes
 

src/commonMain/kotlin/dev/inmo/krontab/builder/SchedulerBuilder.kt

@@ -1,7 +1,7 @@
 package dev.inmo.krontab.builder
 
-import com.soywiz.klock.TimezoneOffset
+import korlibs.time.TimezoneOffset
-import com.soywiz.klock.minutes
+import korlibs.time.minutes
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.KronSchedulerTz
 import dev.inmo.krontab.internal.*

src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionKronScheduler.kt

@@ -1,7 +1,7 @@
 package dev.inmo.krontab.collection
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
 import dev.inmo.krontab.*
 import dev.inmo.krontab.internal.*
 

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

@@ -1,7 +1,7 @@
 package dev.inmo.krontab.internal
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.TimezoneOffset
+import korlibs.time.TimezoneOffset
 import dev.inmo.krontab.KronScheduler
 
 /**

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.internal
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.krontab.KronScheduler
 
 /**

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

@@ -1,8 +1,8 @@
 package dev.inmo.krontab.internal
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
-import com.soywiz.klock.TimezoneOffset
+import korlibs.time.TimezoneOffset
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.KronSchedulerTz
 

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.internal
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import dev.inmo.krontab.utils.copy
 import kotlin.math.min
 

src/commonMain/kotlin/dev/inmo/krontab/utils/DateTimeCopy.kt

@@ -1,7 +1,7 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.Month
+import korlibs.time.Month
 import kotlin.math.min
 
 fun DateTime.copy(

src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt

@@ -1,8 +1,8 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.DateTimeTz
+import korlibs.time.DateTimeTz
-import com.soywiz.klock.milliseconds
+import korlibs.time.milliseconds
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.next
 import kotlinx.coroutines.currentCoroutineContext

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils.flows
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils.flows
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils.flows
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import kotlinx.coroutines.flow.Flow
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils.flows
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import kotlinx.coroutines.flow.Flow
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -1,7 +1,7 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.days
+import korlibs.time.days
 import dev.inmo.krontab.buildSchedule
 import kotlinx.coroutines.test.runTest
 import kotlin.test.*

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import dev.inmo.krontab.KronSchedulerTz
 import dev.inmo.krontab.buildSchedule
 import kotlinx.coroutines.*

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import dev.inmo.krontab.builder.buildSchedule
 import dev.inmo.krontab.next
 import kotlinx.coroutines.test.runTest

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

@@ -1,6 +1,6 @@
 package dev.inmo.krontab.utils
 
-import com.soywiz.klock.*
+import korlibs.time.*
 import dev.inmo.krontab.builder.buildSchedule
 import kotlinx.coroutines.test.runTest
 import kotlin.math.ceil

src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.krontab"/>

src/main/kotlin/dev/inmo/krontab/KronSchedulerWork.kt

@@ -2,7 +2,7 @@ package dev.inmo.krontab
 
 import android.content.Context
 import androidx.work.*
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import java.util.concurrent.TimeUnit
 
 /**