Merge 998c5d7b32 into 1be8d947f7

CHANGELOG.md

@@ -1,26 +1,5 @@
 # Changelog
 
-## 2.2.2
-
-* Versions
-  * `Kotlin`: `1.9.20-RC`
-  * `Android` (min/target): `34`
-
-## 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
 
 * Versions

build.gradle

@@ -61,7 +61,6 @@ kotlin {
     }
     linuxX64()
     mingwX64()
-    linuxArm64()
 
 
     sourceSets {
@@ -98,7 +97,7 @@ kotlin {
                 implementation kotlin('test-js')
             }
         }
-        androidUnitTest {
+        androidTest {
             dependencies {
                 implementation kotlin('test-junit')
             }

gradle.properties

@@ -9,13 +9,13 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.9.20-RC
+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.10
+dokka_version=1.8.20
 
-klockVersion=4.0.10
+klockVersion=4.0.3
 
 ## Github reease
 
@@ -23,10 +23,10 @@ github_release_plugin_version=2.4.1
 
 ## Android
 
-android_gradle_version=7.4.2
+android_gradle_version=8.0.2
 android_minSdkVersion=21
-android_compileSdkVersion=34
+android_compileSdkVersion=33
-android_buildToolsVersion=34.0.0
+android_buildToolsVersion=33.0.2
 dexcount_version=4.0.0
 junit_version=4.12
 test_ext_junit_version=1.1.3
@@ -36,5 +36,5 @@ androidx_work_version=2.8.1
 
 ## Common
 
-version=2.2.2
+version=2.1.2
-android_code_version=32
+android_code_version=29

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip

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

@@ -108,19 +108,13 @@ internal fun NearDateTimeCalculatorDays(
         } else {
             dateTime
         })
-        val newDateTime = dateTime.copy(
+        dateTime.copy(
             dayOfMonth = min(dateTime.month.days(dateTime.year), newOne.toInt() + 1), // index1
             hour = 0,
             minute = 0,
             second = 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
-        }
     }
 )