Compare commits

..

2 Commits

Author SHA1 Message Date
renovate[bot]
dc982cb952 Merge 998c5d7b32 into 1be8d947f7 2023-07-17 23:34:53 +00:00
renovate[bot]
998c5d7b32 Update dependency com.android.tools.build:gradle to v8 2023-06-26 20:50:51 +00:00
39 changed files with 10 additions and 31 deletions

View File

@@ -1,20 +1,5 @@
# Changelog # Changelog
## 2.2.1
* Potential fix of [#65](https://github.com/InsanusMokrassar/krontab/issues/65)
* Versions
* `Kotlin`: `1.9.20-Beta`
* `Klock`: `4.0.10`
* `Serialization`: `1.6.0`
## 2.2.0
* Versions
* `Kotlin`: `1.9.0`
* `Coroutines`: `1.7.3`
* `Klock`: `4.0.9`
## 2.1.2 ## 2.1.2
* Versions * Versions

View File

@@ -97,7 +97,7 @@ kotlin {
implementation kotlin('test-js') implementation kotlin('test-js')
} }
} }
androidUnitTest { androidTest {
dependencies { dependencies {
implementation kotlin('test-junit') implementation kotlin('test-junit')
} }

View File

@@ -9,13 +9,13 @@ android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin_version=1.9.20-Beta kotlin_version=1.8.22
kotlin_coroutines_version=1.7.3 kotlin_coroutines_version=1.7.2
kotlin_serialization_version=1.6.0 kotlin_serialization_version=1.5.1
dokka_version=1.9.0 dokka_version=1.8.20
klockVersion=4.0.10 klockVersion=4.0.3
## Github reease ## Github reease
@@ -23,7 +23,7 @@ github_release_plugin_version=2.4.1
## Android ## Android
android_gradle_version=7.4.2 android_gradle_version=8.0.2
android_minSdkVersion=21 android_minSdkVersion=21
android_compileSdkVersion=33 android_compileSdkVersion=33
android_buildToolsVersion=33.0.2 android_buildToolsVersion=33.0.2
@@ -36,5 +36,5 @@ androidx_work_version=2.8.1
## Common ## Common
version=2.2.1 version=2.1.2
android_code_version=31 android_code_version=29

View File

@@ -108,19 +108,13 @@ internal fun NearDateTimeCalculatorDays(
} else { } else {
dateTime dateTime
}) })
val newDateTime = dateTime.copy( dateTime.copy(
dayOfMonth = min(dateTime.month.days(dateTime.year), newOne.toInt() + 1), // index1 dayOfMonth = min(dateTime.month.days(dateTime.year), newOne.toInt() + 1), // index1
hour = 0, hour = 0,
minute = 0, minute = 0,
second = 0, second = 0,
milliseconds = 0 milliseconds = 0
) )
// If day of month has not been changed, use old dateTime due to no changes required
if (newDateTime.dayOfMonth == dateTime.dayOfMonth) {
dateTime
} else {
newDateTime
}
} }
) )