From 7d8b990ec4a48b5515c19133fa96e7a019b5ce67 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 18 Apr 2022 14:30:38 +0600 Subject: [PATCH] remove tgbotapi.extensions.* --- CHANGELOG.md | 2 + settings.gradle | 4 -- tgbotapi.core/build.gradle | 2 +- tgbotapi.extensions.api/build.gradle | 56 ------------------- .../build.gradle | 50 ----------------- .../build.gradle | 56 ------------------- tgbotapi.extensions.utils/build.gradle | 56 ------------------- 7 files changed, 3 insertions(+), 223 deletions(-) delete mode 100644 tgbotapi.extensions.api/build.gradle delete mode 100644 tgbotapi.extensions.behaviour_builder.fsm/build.gradle delete mode 100644 tgbotapi.extensions.behaviour_builder/build.gradle delete mode 100644 tgbotapi.extensions.utils/build.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index 24cb1f47d8..473a95a5c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ __This update contains including of [Telegram Bot API 6.0](https://core.telegram.org/bots/api-changelog#april-16-2022)__ +__All the `tgbotapi.extensions.*` packages have been removed__ + * `Core`: * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json` ([#563](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/563)) * All the interfaces from `dev.inmo.tgbotapi.types.files.abstracts` have been replaced to `dev.inmo.tgbotapi.types.files` and converted to sealed ([#550](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/550)) diff --git a/settings.gradle b/settings.gradle index f33377257e..bd0430c7c5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,9 +16,5 @@ include ":tgbotapi.api" include ":tgbotapi.utils" include ":tgbotapi.behaviour_builder" include ":tgbotapi.behaviour_builder.fsm" -include ":tgbotapi.extensions.api" -include ":tgbotapi.extensions.utils" -include ":tgbotapi.extensions.behaviour_builder" -include ":tgbotapi.extensions.behaviour_builder.fsm" include ":tgbotapi" include ":docs" diff --git a/tgbotapi.core/build.gradle b/tgbotapi.core/build.gradle index eee2044694..e7d8a06973 100644 --- a/tgbotapi.core/build.gradle +++ b/tgbotapi.core/build.gradle @@ -64,7 +64,7 @@ kotlin { dependencies { implementation kotlin('test-common') implementation kotlin('test-annotations-common') - implementation project(":tgbotapi.extensions.utils") + implementation project(":tgbotapi.utils") } } diff --git a/tgbotapi.extensions.api/build.gradle b/tgbotapi.extensions.api/build.gradle deleted file mode 100644 index 19f9b94bce..0000000000 --- a/tgbotapi.extensions.api/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -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 = "DEPRECATED, use tgbotapi.api" - -apply from: "../publish.gradle" - -repositories { - mavenLocal() - mavenCentral() -} - -kotlin { - jvm { - compilations.main { - kotlinOptions { - jvmTarget = "1.8" - } - } - } - js(IR) { - browser() - nodejs() - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib') - api project(":tgbotapi.api") - } - } - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - diff --git a/tgbotapi.extensions.behaviour_builder.fsm/build.gradle b/tgbotapi.extensions.behaviour_builder.fsm/build.gradle deleted file mode 100644 index d65af85ca1..0000000000 --- a/tgbotapi.extensions.behaviour_builder.fsm/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -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 = "DEPRECATED, use tgbotapi.behaviour_builder.fsm" - -apply from: "../publish.gradle" - -repositories { - mavenLocal() - mavenCentral() -} - -kotlin { - jvm() - js(IR) { - browser() - nodejs() - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib') - api project(":tgbotapi.behaviour_builder.fsm") - } - } - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - diff --git a/tgbotapi.extensions.behaviour_builder/build.gradle b/tgbotapi.extensions.behaviour_builder/build.gradle deleted file mode 100644 index 74e5743851..0000000000 --- a/tgbotapi.extensions.behaviour_builder/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -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 = "DEPRECATED, use tgbotapi.behaviour_builder" - -apply from: "../publish.gradle" - -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") - } - } - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - diff --git a/tgbotapi.extensions.utils/build.gradle b/tgbotapi.extensions.utils/build.gradle deleted file mode 100644 index f34195fe8d..0000000000 --- a/tgbotapi.extensions.utils/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -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 = "DEPRECATED, use tgbotapi.utils" - -apply from: "../publish.gradle" - -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 -} -