diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8152c5d..b924ba0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,5 +40,5 @@ jobs: - name: Publish run: ./gradlew publishAllPublicationsToMavenCentralRepository -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} -Psigning.password=${{ secrets.SIGNING_PASSWORD }} -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} \ No newline at end of file + MAVEN_USERNAME: ${{ secrets.MAVEN_TOKEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_TOKEN_PASSWORD }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 840390c..5b5adaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Project exclude paths .gradle/ .idea/ -build/ \ No newline at end of file +build/ +.kotlin/ \ No newline at end of file diff --git a/README.md b/README.md index 167ae4b..a5ca5ad 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # KCron Cron realization for Kotlin Multiplatform -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Scogun_kcron-common&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Scogun_kcron-common) ![GitHub](https://img.shields.io/github/license/Scogun/kcron-common?color=blue) ![Publish workflow](https://github.com/Scogun/kcron-common/actions/workflows/publish.yml/badge.svg) [![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.kcron/kcron-common/0.14.4?color=blue)](https://search.maven.org/artifact/com.ucasoft.kcron/kcron-common/0.14.4/jar) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Scogun_kcron-common&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Scogun_kcron-common) ![GitHub](https://img.shields.io/github/license/Scogun/kcron-common?color=blue) ![Publish workflow](https://github.com/Scogun/kcron-common/actions/workflows/publish.yml/badge.svg) [![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.kcron/kcron-common/0.20.2?color=blue)](https://search.maven.org/artifact/com.ucasoft.kcron/kcron-common/0.20.2/jar) ### Features * Kotlin Multiplatform library @@ -50,7 +50,7 @@ kotlin { sourceSets { commonMain { dependencies { - implementation 'com.ucasoft.kcron:kcron-common:0.14.4' + implementation 'com.ucasoft.kcron:kcron-common:0.20.2' } } } @@ -115,6 +115,6 @@ builder.years(2021..2025) println(builder.expression) // 0/10 5-25 5,12 ? * SUN#5 2021-2025 ``` ### Current status -This library is on beta version `0.14.4`. +This library is on beta version `0.20.2`. It is continuing to develop. Check the news! diff --git a/build.gradle.kts b/build.gradle.kts index 20ca1b0..432ad94 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,15 @@ +plugins { + alias(libs.plugins.multiplatform) apply false + id("publish") apply false + alias(libs.plugins.kover) apply false + alias(libs.plugins.benchmark) apply false +} + allprojects { group = "com.ucasoft.kcron" - version = "0.14.4" + version = "0.20.2" repositories { mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1ec5fa..2325cdf 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -kotlin = "1.9.24" -kotlinx-datetime = "0.6.0" +kotlin = "2.0.20" +kotlinx-datetime = "0.6.1" kotest = "5.9.1" -kover = "0.7.6" +kover = "0.8.3" benchmark = "0.4.11" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..df97d72 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/kcron-abstractions/build.gradle.kts b/kcron-abstractions/build.gradle.kts index 07246d0..c695ae8 100644 --- a/kcron-abstractions/build.gradle.kts +++ b/kcron-abstractions/build.gradle.kts @@ -1,16 +1,11 @@ plugins { alias(libs.plugins.multiplatform) id("publish") - alias(libs.plugins.kover) apply false - alias(libs.plugins.benchmark) apply false } kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } + jvmToolchain(8) + jvm() linuxX64() linuxArm64() mingwX64() diff --git a/kcron-common-benchmark/build.gradle.kts b/kcron-common-benchmark/build.gradle.kts index 9b55d1b..0f01c5e 100644 --- a/kcron-common-benchmark/build.gradle.kts +++ b/kcron-common-benchmark/build.gradle.kts @@ -1,15 +1,11 @@ plugins { alias(libs.plugins.multiplatform) alias(libs.plugins.benchmark) - alias(libs.plugins.kover) apply false } kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } + jvmToolchain(8) + jvm() linuxX64() mingwX64() macosX64() diff --git a/kcron-common/build.gradle.kts b/kcron-common/build.gradle.kts index 4ee186d..b3234b1 100644 --- a/kcron-common/build.gradle.kts +++ b/kcron-common/build.gradle.kts @@ -2,15 +2,11 @@ plugins { alias(libs.plugins.multiplatform) id("publish") alias(libs.plugins.kover) - alias(libs.plugins.benchmark) apply false } kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } + jvmToolchain(8) + jvm() linuxX64() linuxArm64() mingwX64() diff --git a/kcron-core/build.gradle.kts b/kcron-core/build.gradle.kts index c610591..d3e12c0 100644 --- a/kcron-core/build.gradle.kts +++ b/kcron-core/build.gradle.kts @@ -2,15 +2,11 @@ plugins { alias(libs.plugins.multiplatform) id("publish") alias(libs.plugins.kover) - alias(libs.plugins.benchmark) apply false } kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } + jvmToolchain(8) + jvm() linuxX64() linuxArm64() mingwX64() diff --git a/kcron-kotlinx-datetime/build.gradle.kts b/kcron-kotlinx-datetime/build.gradle.kts index 6085f61..140aee7 100644 --- a/kcron-kotlinx-datetime/build.gradle.kts +++ b/kcron-kotlinx-datetime/build.gradle.kts @@ -1,16 +1,11 @@ plugins { alias(libs.plugins.multiplatform) id("publish") - alias(libs.plugins.kover) apply false - alias(libs.plugins.benchmark) apply false } kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } + jvmToolchain(8) + jvm() linuxX64() linuxArm64() mingwX64()