diff --git a/gradle.properties b/gradle.properties index 8197dfd..c4a73c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,3 +8,5 @@ klockVersion=1.7.3 project_public_name=Krontab project_public_description=It is analog of crontab util for Kotlin Coroutines +project_vcs_base=https://git.insanusmokrassar.com/InsanusMokrassar +project_connection_base=git://git.insanusmokrassar.com/insanusmokrassar diff --git a/maven.publish.gradle b/maven.publish.gradle index 5a96edc..6eb68e2 100644 --- a/maven.publish.gradle +++ b/maven.publish.gradle @@ -25,12 +25,10 @@ publishing { resolveStrategy = Closure.DELEGATE_FIRST name "${project_public_name}" description "${project_public_description}" - url "https://insanusmokrassar.github.io/${project.name}" scm { - connection "scm:git:git://github.com/insanusmokrassar/${project.name}.git" - developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/${project.name}.git[push=]ssh:git@github.com:insanusmokrassar/${project.name}.git" - url "https://github.com/insanusmokrassar/${project.name}" + developerConnection "scm:git:[fetch=]${project_vcs_base}/${project.name}.git[push=]ssh:git@github.com:insanusmokrassar/${project.name}.git" + url "${project_vcs_base}/${project.name}" } @@ -44,9 +42,9 @@ publishing { licenses { license { - name 'The Apache Software License, Version 2.0' - url 'https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE' - distribution 'repo' + name "The Apache Software License, Version 2.0" + url "${project_vcs_base}/${project.name}/blob/master/LICENSE" + distribution "repo" } } } diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/CronDateTimeScheduler.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/CronDateTimeScheduler.kt similarity index 80% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/CronDateTimeScheduler.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/CronDateTimeScheduler.kt index 29250b8..0b3370f 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/CronDateTimeScheduler.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/CronDateTimeScheduler.kt @@ -1,5 +1,13 @@ -package com.github.insanusmokrassar.krontab +package com.insanusmokrassar.krontab +import com.insanusmokrassar.krontab.internal.* +import com.insanusmokrassar.krontab.internal.CronDateTime +import com.insanusmokrassar.krontab.internal.parseDaysOfMonth +import com.insanusmokrassar.krontab.internal.parseHours +import com.insanusmokrassar.krontab.internal.parseMinutes +import com.insanusmokrassar.krontab.internal.parseMonths +import com.insanusmokrassar.krontab.internal.parseSeconds +import com.insanusmokrassar.krontab.internal.toNearDateTime import com.soywiz.klock.DateTime import kotlinx.coroutines.delay diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/Executes.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/Executes.kt similarity index 95% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/Executes.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/Executes.kt index 3dfd890..e0934d2 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/Executes.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/Executes.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.krontab +package com.insanusmokrassar.krontab suspend inline fun CronDateTimeScheduler.executeInfinity(noinline block: suspend () -> Unit) = doInLoop { block() diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/SchedulerShortcuts.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/SchedulerShortcuts.kt similarity index 77% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/SchedulerShortcuts.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/SchedulerShortcuts.kt index 1c8c732..2220ab7 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/SchedulerShortcuts.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/SchedulerShortcuts.kt @@ -1,6 +1,7 @@ -package com.github.insanusmokrassar.krontab +package com.insanusmokrassar.krontab -import com.github.insanusmokrassar.krontab.builder.buildSchedule +import com.insanusmokrassar.krontab.internal.CronDateTime +import com.insanusmokrassar.krontab.builder.buildSchedule internal val anyCronDateTime by lazy { CronDateTime() diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/SchedulerBuilder.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/SchedulerBuilder.kt similarity index 93% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/SchedulerBuilder.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/SchedulerBuilder.kt index 1d9d004..92a24c2 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/SchedulerBuilder.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/SchedulerBuilder.kt @@ -1,6 +1,8 @@ -package com.github.insanusmokrassar.krontab.builder +package com.insanusmokrassar.krontab.builder -import com.github.insanusmokrassar.krontab.* +import com.insanusmokrassar.krontab.CronDateTimeScheduler +import com.insanusmokrassar.krontab.internal.CronDateTime +import com.insanusmokrassar.krontab.internal.fillWith fun buildSchedule(settingsBlock: SchedulerBuilder.() -> Unit): CronDateTimeScheduler { val builder = SchedulerBuilder() diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/TimeBuilder.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/TimeBuilder.kt similarity index 93% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/TimeBuilder.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/TimeBuilder.kt index edb3d3b..c4605e0 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/builder/TimeBuilder.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/builder/TimeBuilder.kt @@ -1,10 +1,10 @@ -package com.github.insanusmokrassar.krontab.builder +package com.insanusmokrassar.krontab.builder import com.github.insanusmokrassar.krontab.* import com.github.insanusmokrassar.krontab.minutesRange import com.github.insanusmokrassar.krontab.monthRange import com.github.insanusmokrassar.krontab.secondsRange -import com.github.insanusmokrassar.krontab.utils.clamp +import com.insanusmokrassar.krontab.utils.clamp sealed class TimeBuilder ( private val restrictionsRange: IntRange diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/CronDateTime.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTime.kt similarity index 85% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/CronDateTime.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTime.kt index 64a008b..f22353b 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/CronDateTime.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTime.kt @@ -1,6 +1,11 @@ -package com.github.insanusmokrassar.krontab +package com.insanusmokrassar.krontab.internal -import com.github.insanusmokrassar.krontab.utils.* +import com.github.insanusmokrassar.krontab.dayOfMonthRange +import com.github.insanusmokrassar.krontab.hoursRange +import com.github.insanusmokrassar.krontab.minutesRange +import com.github.insanusmokrassar.krontab.monthRange +import com.github.insanusmokrassar.krontab.secondsRange +import com.insanusmokrassar.krontab.utils.clamp import com.soywiz.klock.DateTime import com.soywiz.klock.DateTimeSpan diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/Parser.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/Parser.kt similarity index 80% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/Parser.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/Parser.kt index c6122fc..3646cf5 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/Parser.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/Parser.kt @@ -1,6 +1,11 @@ -package com.github.insanusmokrassar.krontab +package com.insanusmokrassar.krontab.internal -import com.github.insanusmokrassar.krontab.utils.* +import com.github.insanusmokrassar.krontab.dayOfMonthRange +import com.github.insanusmokrassar.krontab.hoursRange +import com.github.insanusmokrassar.krontab.minutesRange +import com.github.insanusmokrassar.krontab.monthRange +import com.github.insanusmokrassar.krontab.secondsRange +import com.insanusmokrassar.krontab.utils.clamp private fun createCronDateTimeScheduler(from: String, dataRange: IntRange): Array? { val things = from.split(",") diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/Ranges.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/Ranges.kt similarity index 100% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/internal/Ranges.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/Ranges.kt diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/utils/Data.kt b/src/commonMain/kotlin/com/insanusmokrassar/krontab/utils/Data.kt similarity index 78% rename from src/commonMain/kotlin/com/github/insanusmokrassar/krontab/utils/Data.kt rename to src/commonMain/kotlin/com/insanusmokrassar/krontab/utils/Data.kt index 95104af..305df46 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/krontab/utils/Data.kt +++ b/src/commonMain/kotlin/com/insanusmokrassar/krontab/utils/Data.kt @@ -1,4 +1,4 @@ -package com.github.insanusmokrassar.krontab.utils +package com.insanusmokrassar.krontab.utils internal fun Int.clamp(min: Int, max: Int): Int = if (this < min) min else if (this > max) max else this internal fun Int.clamp(range: IntRange): Int = clamp(range.first, range.last)