update dependencies

2.2.6

.github/workflows/kdocs.yml

@@ -10,10 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && cp d8 dx && cd lib  && cp d8.jar dx.jar
+          java-version: 17
       - name: Build
         run: ./gradlew dokkaHtml
       - name: Publish KDocs

.github/workflows/publishing_packages.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 2.2.7
+
+* `Version`:
+  * `Klock`: `5.3.1`
+  * `AndroidXWork`: `2.9.0`
+
+## 2.2.6
+
+**Since this version klock depdendency replaced with `com.soywiz.korge:korlibs-time`**
+
+* `Version`:
+  * `Klock`: `5.3.0`
+
+## 2.2.5
+
+* `Versions`
+  * `Kotlin`: `1.9.22`
+  * `Serialization`: `1.6.2`
+
+## 2.2.4
+
+* `Versions`
+  * `Kotlin`: `1.9.21`
+  * `Serialization`: `1.6.1`
+
+## 2.2.3
+
+**THIS UPDATE CONTAINS UPGRADE OF USED JDK UP TO 17**
+
+* Versions
+  * `Kotlin`: `1.9.20`
+
 ## 2.2.2
 
 * Versions

build.gradle

@@ -71,7 +71,7 @@ kotlin {
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialization_version"
 
-                api "com.soywiz.korlibs.klock:klock:$klockVersion"
+                api "com.soywiz.korge:korlibs-time:$klockVersion"
             }
         }
 
@@ -110,7 +110,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
     compileSdk "$android_compileSdkVersion".toInteger()
-    buildToolsVersion "$android_buildToolsVersion"
+    buildToolsVersion = "$android_buildToolsVersion"
     namespace "${group}.${project.name}"
 
     defaultConfig {
@@ -129,8 +129,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -142,6 +142,6 @@ android {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

gradle.properties

@@ -9,13 +9,13 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.9.20-RC
+kotlin_version=1.9.22
 kotlin_coroutines_version=1.7.3
-kotlin_serialization_version=1.6.0
+kotlin_serialization_version=1.6.2
 
 dokka_version=1.9.10
 
-klockVersion=4.0.10
+klockVersion=5.3.1
 
 ## Github reease
 
@@ -23,7 +23,7 @@ github_release_plugin_version=2.4.1
 
 ## Android
 
-android_gradle_version=7.4.2
+android_gradle_version=8.1.4
 android_minSdkVersion=21
 android_compileSdkVersion=34
 android_buildToolsVersion=34.0.0
@@ -32,9 +32,9 @@ junit_version=4.12
 test_ext_junit_version=1.1.3
 espresso_core=3.4.0
 
-androidx_work_version=2.8.1
+androidx_work_version=2.9.0
 
 ## Common
 
-version=2.2.2
-android_code_version=32
+version=2.2.7
+android_code_version=37

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-8.5-bin.zip

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -50,18 +50,14 @@ publishing {
             
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    name = "InmoNexus"
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
-                        name = "Authorization"
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
+                    credentials {
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                     }
             
                 }
@@ -96,4 +92,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

src/androidMain/kotlin/KronSchedulerWork.kt

@@ -3,6 +3,7 @@ package dev.inmo.krontab
 import android.content.Context
 import androidx.work.*
 import korlibs.time.DateTime
+import korlibs.time.millisecondsLong
 import java.util.concurrent.TimeUnit
 
 /**

src/commonMain/kotlin/Executes.kt

@@ -2,6 +2,7 @@ package dev.inmo.krontab
 
 import korlibs.time.DateTime
 import korlibs.time.DateTimeTz
+import korlibs.time.millisecondsLong
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlin.coroutines.coroutineContext

src/commonMain/kotlin/utils/SchedulerFlow.kt

@@ -5,6 +5,7 @@ import korlibs.time.DateTimeTz
 import korlibs.time.milliseconds
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.next
+import korlibs.time.millisecondsLong
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow