Compare commits

...

11 Commits

5 changed files with 34 additions and 13 deletions

View File

@@ -1,5 +1,15 @@
# Changelog # Changelog
## 2.7.2
* `Version`:
* `Kotlin`: `2.1.10`
* `Serialization`: `1.8.0`
## 2.7.1
* Fixes in parser and checker
## 2.7.0 ## 2.7.0
* `Version`: * `Version`:

View File

@@ -11,12 +11,20 @@ private String getCurrentVersionChangelog(String version) {
return changelogDataOS.toString().trim() return changelogDataOS.toString().trim()
} }
if (new File(projectDir, "secret.gradle").exists()) {
apply from: './secret.gradle' def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
def secretFile = new File(projectDir, "secret.gradle")
if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
if (secretFile.exists()) {
apply from: './secret.gradle'
}
apply plugin: "com.github.breadmoirai.github-release" apply plugin: "com.github.breadmoirai.github-release"
def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
githubRelease { githubRelease {
token "${project.property('GITHUB_RELEASE_TOKEN')}" token githubReleaseToken
owner = "InsanusMokrassar" owner = "InsanusMokrassar"
repo = "${rootProject.name}" repo = "${rootProject.name}"

View File

@@ -9,9 +9,9 @@ android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin_version=2.1.0 kotlin_version=2.1.10
kotlin_coroutines_version=1.10.1 kotlin_coroutines_version=1.10.1
kotlin_serialization_version=1.7.3 kotlin_serialization_version=1.8.0
dokka_version=2.0.0 dokka_version=2.0.0
@@ -23,7 +23,7 @@ github_release_plugin_version=2.5.2
## Android ## Android
android_gradle_version=8.2.2 android_gradle_version=8.7.2
android_minSdkVersion=21 android_minSdkVersion=21
android_compileSdkVersion=35 android_compileSdkVersion=35
android_buildToolsVersion=35.0.0 android_buildToolsVersion=35.0.0
@@ -32,9 +32,9 @@ 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.10.0 androidx_work_version=2.11.0
## Common ## Common
version=2.7.0 version=2.7.2
android_code_version=46 android_code_version=48

View File

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

View File

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