Merge e5b33ae9b0 into 4afebd8b7e

CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog
 
-## 2.7.1
-
-* Fixes in parser and checker
-
-## 2.7.0
-
-* `Version`:
-  * `Kotlin`: `2.1.0`
-  * `Coroutines`: `1.10.1`
-* Add WASM support (solution of [#137](https://github.com/InsanusMokrassar/krontab/issues/137))
-
 ## 2.6.1
 
 * Fixes in parsing of string parts

README.md

@@ -8,7 +8,6 @@
 ![Android](https://img.shields.io/badge/Android-green?style=for-the-badge&logo=android&logoColor=white)
 ![Js](https://img.shields.io/badge/JavaScript-323330?style=for-the-badge&logo=javascript&logoColor=F7DF1E)
 ![Linux x64](https://img.shields.io/badge/Linux%20x64-white?style=for-the-badge&logo=linux&logoColor=black)
-![WASM](https://img.shields.io/badge/WASM-654FF0?style=for-the-badge&logo=webassembly&logoColor=white)
 
 [![KDocs](https://img.shields.io/badge/KDocs-323330?style=for-the-badge&logo=Kotlin&logoColor=7F52FF)](https://insanusmokrassar.github.io/krontab/)
 [![Tutorials](https://img.shields.io/badge/Tutorials-0288D1?style=for-the-badge&logo=mkdocs&logoColor=white)](https://docs.inmo.dev/krontab/index.html)

build.gradle

@@ -62,11 +62,6 @@ kotlin {
     linuxX64()
     mingwX64()
     linuxArm64()
-    wasm {
-        browser()
-        nodejs()
-        d8()
-    }
 
 
     sourceSets {
@@ -90,7 +85,6 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
-                implementation kotlin('test')
                 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_version"
             }
         }

gradle.properties

@@ -9,11 +9,11 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=2.1.0
-kotlin_coroutines_version=1.10.1
+kotlin_version=2.0.21
+kotlin_coroutines_version=1.9.0
 kotlin_serialization_version=1.7.3
 
-dokka_version=2.0.0
+dokka_version=1.9.20
 
 klockVersion=5.4.0
 
@@ -36,5 +36,5 @@ androidx_work_version=2.10.0
 
 ## Common
 
-version=2.7.1
-android_code_version=47
+version=2.6.1
+android_code_version=45

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-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip

src/commonMain/kotlin/internal/Parser.kt

@@ -43,9 +43,7 @@ private fun <T> createSimpleScheduler(from: String, dataRange: IntRange, dataCon
  * 1.
  *     * "\\d" -> 2
  *     * "\\*" -> 4
- *     * "F" -> 7
  *     * "f" -> 7
- *     * "L" -> 7
  *     * "l" -> 7
  *     * "/" -> 6
  * 2.
@@ -57,7 +55,6 @@ private fun <T> createSimpleScheduler(from: String, dataRange: IntRange, dataCon
  *     * "o" -> 10
  *     * "w" -> 10
  * 3.
- *     * "L" -> 7
  *     * "l" -> 7
  *     * "\\d" -> 8
  * 4.
@@ -81,8 +78,8 @@ private val checkIncomingPartTransitionsMap = listOf(
     listOf( // 0
         Regex("\\d") to 1,
         Regex("\\*") to 3,
-        Regex("[Ff]") to 6,
-        Regex("[Ll]") to 6,
+        Regex("f") to 6,
+        Regex("l") to 6,
         Regex("/") to 5,
     ),
     listOf( // 1
@@ -95,7 +92,7 @@ private val checkIncomingPartTransitionsMap = listOf(
         Regex("w") to 9,
     ),
     listOf( // 2
-        Regex("[Ll]") to 6,
+        Regex("l") to 6,
         Regex("\\d") to 7,
     ),
     listOf( // 3