CHANGELOG.md

@@ -1,12 +1,5 @@
 # TelegramBotAPI changelog
 
-## 2.1.2
-
-* `Versions`:
-    * `Coroutines`: `1.6.1` -> `1.6.3`
-    * `Ktor`: `2.0.2` -> `2.0.3`
-    * `MicroUtils`: `0.11.6` -> `0.11.9`
-
 ## 2.1.1
 
 * `API`:

build.gradle

@@ -6,20 +6,19 @@ buildscript {
     }
 
     dependencies {
-        classpath libs.kotlin.gradle.plugin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath libs.kotlin.serialization.plugin
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath libs.kotlin.dokka.plugin
+        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
-        classpath libs.github.release.plugin
     }
 }
 
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" apply false
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" apply false
+}
+
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-    }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->
             if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
@@ -28,7 +27,6 @@ allprojects {
         }
     }
 }
-apply from: "./extensions.gradle"
 
 private String getCurrentVersionChangelog() {
     OutputStream changelogDataOS = new ByteArrayOutputStream()

docs/build.gradle

@@ -1,17 +1,45 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
+    id "org.jetbrains.dokka" version "$dokka_version"
 }
 
-project.description = "Full collection of all built-in tgbotapi tools"
+repositories {
-
+    mavenLocal()
-apply from: "$mppProjectWithSerializationPresetPath"
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
+
                 api project(":tgbotapi.core")
                 api project(":tgbotapi.api")
                 api project(":tgbotapi.utils")
@@ -75,3 +103,8 @@ Object callback = {
 
 tasks.dokkaGfm(callback)
 tasks.dokkaHtml(callback)
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

extensions.gradle

@@ -1,8 +0,0 @@
-allprojects {
-    ext {
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
-        mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
-
-        publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
-    }
-}

gradle.properties

@@ -5,5 +5,21 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
+kotlin_version=1.6.21
+kotlin_coroutines_version=1.6.1
+kotlin_serialisation_runtime_version=1.3.3
+korlibs_version=2.7.0
+uuid_version=0.4.1
+ktor_version=2.0.2
+
+micro_utils_version=0.11.6
+
+javax_activation_version=1.1.1
+
+
+dokka_version=1.6.21
+
 library_group=dev.inmo
-library_version=2.1.2
+library_version=2.1.1
+
+github_release_plugin_version=2.4.1

gradle/libs.versions.toml

@@ -1,59 +0,0 @@
-[versions]
-
-kotlin = "1.6.21"
-kotlin-serialization = "1.3.3"
-kotlin-coroutines = "1.6.3"
-kotlin-gradle-plugin = "7.0.4"
-
-javax-activation = "1.1.1"
-
-korlibs = "2.7.0"
-uuid = "0.4.1"
-ktor = "2.0.3"
-
-microutils = "0.11.9"
-
-github-release-plugin = "2.4.1"
-
-[libraries]
-
-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
-kotlin-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlin-serialization" }
-kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
-kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
-
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
-ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
-
-javax-activation = { module = "javax.activation:activation", version.ref = "javax-activation" }
-
-korlibs-klock =  { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" }
-korlibs-krypto =  { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" }
-
-uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
-
-microutils-coroutines = { module = "dev.inmo:micro_utils.coroutines", version.ref = "microutils" }
-microutils-serialization-base64 = { module = "dev.inmo:micro_utils.serialization.base64", version.ref = "microutils" }
-microutils-serialization-encapsulator = { module = "dev.inmo:micro_utils.serialization.encapsulator", version.ref = "microutils" }
-microutils-serialization-typedSerializer = { module = "dev.inmo:micro_utils.serialization.typed_serializer", version.ref = "microutils" }
-microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", version.ref = "microutils" }
-microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
-microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
-
-# buildscript classpaths
-
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" }
-github-release-plugin = { module = "com.github.breadmoirai:github-release", version.ref = "github-release-plugin" }
-
-[plugins]
-
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

mppJsProject.gradle

@@ -1,32 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}

mppProjectWithSerialization.gradle

@@ -1,47 +0,0 @@
-project.version = "$library_version"
-project.group = "$library_group"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

tgbotapi.api/build.gradle

@@ -1,20 +1,56 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.core")
             }
         }
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+

tgbotapi.behaviour_builder.fsm/build.gradle

@@ -1,20 +1,56 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
-project.description = "Behaviour Builder DSL"
+project.version = "$library_version"
+project.group = "$library_group"
+project.description = "Behaviour Builder extension with built-in FSM"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.behaviour_builder")
-                api libs.microutils.fsm.common
+                api "dev.inmo:micro_utils.fsm.common:$micro_utils_version"
             }
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

tgbotapi.behaviour_builder/build.gradle

@@ -1,19 +1,55 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "Behaviour Builder DSL"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.utils")
             }
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

tgbotapi.core/build.gradle

@@ -1,57 +1,107 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "Core part of tgbotapi with all (and only) required functionality for working with Telegram Bot API"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
-                api libs.kotlin.coroutines
+                implementation kotlin('stdlib')
-                api libs.kotlin.serialization
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-                api libs.kotlin.serialization.properties
+                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-properties:$kotlin_serialisation_runtime_version"
 
-                api libs.korlibs.klock
+                api "com.soywiz.korlibs.klock:klock:$korlibs_version"
-                api libs.korlibs.krypto
+                api "com.soywiz.korlibs.krypto:krypto:$korlibs_version"
-                api libs.uuid
+                api "com.benasher44:uuid:$uuid_version"
 
-                api libs.microutils.coroutines
+                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
-                api libs.microutils.serialization.base64
+                api "dev.inmo:micro_utils.serialization.base64:$micro_utils_version"
-                api libs.microutils.serialization.encapsulator
+                api "dev.inmo:micro_utils.serialization.encapsulator:$micro_utils_version"
-                api libs.microutils.serialization.typedSerializer
+                api "dev.inmo:micro_utils.serialization.typed_serializer:$micro_utils_version"
-                api libs.microutils.ktor.common
+                api "dev.inmo:micro_utils.ktor.common:$micro_utils_version"
-                api libs.microutils.languageCodes
+                api "dev.inmo:micro_utils.language_codes:$micro_utils_version"
 
-                api libs.ktor.client.core
+                api "io.ktor:ktor-client-core:$ktor_version"
             }
         }
         commonTest {
             dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
                 implementation project(":tgbotapi.utils")
             }
         }
+
         jvmMain {
             dependencies {
-                api libs.ktor.server
+                api "io.ktor:ktor-server:$ktor_version"
-                api libs.ktor.server.host.common
+                api "io.ktor:ktor-server-host-common:$ktor_version"
 
-                api libs.ktor.client.cio
+                api "io.ktor:ktor-client-cio:$ktor_version"
 
-                api libs.javax.activation
+                api "javax.activation:activation:$javax_activation_version"
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation kotlin('test-js')
             }
         }
     }
 
-//    targets.all {
+    targets.all {
-//        compilations.all {
+        compilations.all {
-//            kotlinOptions {
+            kotlinOptions {
-//                freeCompilerArgs += ["-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", "-Xopt-in=kotlin.RequiresOptIn"]
+                freeCompilerArgs += ["-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", "-Xopt-in=kotlin.RequiresOptIn"]
-//            }
+            }
-//        }
+        }
-//    }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

tgbotapi.utils/build.gradle

@@ -1,19 +1,73 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "Additional extensions for core part of tgbotapi"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.core")
             }
         }
+
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
             }
         }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation kotlin('test-js')
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

tgbotapi.webapps/build.gradle

@@ -1,19 +1,56 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "Web App bindings for the Telegram Web Apps API"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.core")
             }
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+

tgbotapi/build.gradle

@@ -1,17 +1,48 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
+project.version = "$library_version"
+project.group = "$library_group"
 project.description = "Full collection of all built-in tgbotapi tools"
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "../publish.gradle"
-apply from: "$publishGradlePath"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonMain {
             dependencies {
+                implementation kotlin('stdlib')
                 api project(":tgbotapi.core")
                 api project(":tgbotapi.api")
                 api project(":tgbotapi.utils")
@@ -21,3 +52,9 @@ kotlin {
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+