Merge 1461e6bbbd into e8ef6e6935

CHANGELOG.md

@@ -1,18 +1,5 @@
 # Changelog
 
-## 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`

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

gradle.properties

@@ -15,7 +15,7 @@ kotlin_serialization_version=1.6.2
 
 dokka_version=1.9.10
 
-klockVersion=5.3.1
+klockVersion=4.0.10
 
 ## Github reease
 
@@ -23,7 +23,7 @@ github_release_plugin_version=2.4.1
 
 ## Android
 
-android_gradle_version=8.1.4
+android_gradle_version=8.2.1
 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.2.7
-android_code_version=37
+version=2.2.5
+android_code_version=35

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

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