Compare commits

..

8 Commits

28 changed files with 61 additions and 46 deletions

View File

@@ -1,5 +1,18 @@
# Changelog # Changelog
## 2.0.0
* Versions
* `Kotlin`: `1.8.21`
* `Klock`: `4.0.1`
* Support of `mingwx64` platform
## 1.0.0
* Versions
* `Kotlin`: `1.8.20`
* `AndroidXWork`: `2.8.1`
## 0.10.0 ## 0.10.0
* New extensions for `KronScheduler`: * New extensions for `KronScheduler`:

View File

@@ -10,7 +10,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.github.breadmoirai:github-release:$github_release_plugin_version" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
classpath 'com.android.tools.build:gradle:7.3.1' classpath "com.android.tools.build:gradle:$android_gradle_version"
} }
} }
@@ -58,6 +58,7 @@ kotlin {
publishAllLibraryVariants() publishAllLibraryVariants()
} }
linuxX64() linuxX64()
mingwX64()
sourceSets { sourceSets {
@@ -104,8 +105,9 @@ kotlin {
apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'com.getkeepsafe.dexcount'
android { android {
compileSdkVersion "$android_compileSdkVersion".toInteger() compileSdk "$android_compileSdkVersion".toInteger()
buildToolsVersion "$android_buildToolsVersion" buildToolsVersion "$android_buildToolsVersion"
namespace "${group}.${project.name}"
defaultConfig { defaultConfig {
minSdkVersion "$android_minSdkVersion".toInteger() minSdkVersion "$android_minSdkVersion".toInteger()

View File

@@ -9,12 +9,12 @@ android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin_version=1.8.20 kotlin_version=1.8.21
kotlin_coroutines_version=1.6.4 kotlin_coroutines_version=1.6.4
dokka_version=1.8.10 dokka_version=1.8.10
klockVersion=3.4.0 klockVersion=4.0.1
## Github reease ## Github reease
@@ -22,17 +22,18 @@ github_release_plugin_version=2.4.1
## Android ## Android
android_gradle_version=7.4.2
android_minSdkVersion=21 android_minSdkVersion=21
android_compileSdkVersion=33 android_compileSdkVersion=33
android_buildToolsVersion=33.0.1 android_buildToolsVersion=33.0.2
dexcount_version=3.1.0 dexcount_version=4.0.0
junit_version=4.12 junit_version=4.12
test_ext_junit_version=1.1.3 test_ext_junit_version=1.1.3
espresso_core=3.4.0 espresso_core=3.4.0
androidx_work_version=2.8.0 androidx_work_version=2.8.1
## Common ## Common
version=0.10.0 version=2.0.0
android_code_version=24 android_code_version=26

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab 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.delay
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
import kotlin.coroutines.coroutineContext import kotlin.coroutines.coroutineContext

View File

@@ -1,6 +1,6 @@
package dev.inmo.krontab 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 * This interface was created for abstraction of [next] operation. Currently, there is only

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab 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 * This interface extending [KronScheduler] to use [DateTimeTz] with taking into account offset of incoming time for

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab 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.internal.*
import dev.inmo.krontab.utils.Minutes import dev.inmo.krontab.utils.Minutes

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab.builder 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.KronScheduler
import dev.inmo.krontab.KronSchedulerTz import dev.inmo.krontab.KronSchedulerTz
import dev.inmo.krontab.internal.* import dev.inmo.krontab.internal.*

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab.collection 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.*
import dev.inmo.krontab.internal.* import dev.inmo.krontab.internal.*

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab.internal 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 import dev.inmo.krontab.KronScheduler
/** /**

View File

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

View File

@@ -1,8 +1,8 @@
package dev.inmo.krontab.internal 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.KronScheduler
import dev.inmo.krontab.KronSchedulerTz import dev.inmo.krontab.KronSchedulerTz

View File

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

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab.utils 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 import kotlin.math.min
fun DateTime.copy( fun DateTime.copy(

View File

@@ -1,8 +1,8 @@
package dev.inmo.krontab.utils 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.KronScheduler
import dev.inmo.krontab.next import dev.inmo.krontab.next
import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.currentCoroutineContext

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
package dev.inmo.krontab.utils 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 dev.inmo.krontab.buildSchedule
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import kotlin.test.* import kotlin.test.*

View File

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

View File

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

View File

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

View File

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

View File

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