update publication scripts

0.0.3

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.0.5
+
+* `Versions`
+  * `kotlin`: `1.4.10` -> `1.4.21`
+  * `kotlin coroutines`: `1.4.1` -> `1.4.2`
+  * `tgbotapi`: `0.30.7` -> `0.30.10`
+  * `microutils`: `0.4.1` -> `0.4.11`
+
+## 0.0.4
+
+* `Versions`
+    * `tgbotapi`: `0.30.4` -> `0.30.7`
+    * `microutils`: `0.3.4` -> `0.4.1`
+
+## 0.0.3
+
+* `Bot`:
+    * New function `initPlaguBot` which actually will launch the bot
+
+## 0.0.2
+
+* `Versions`
+    * `tgbotapi`: `0.30.3` -> `0.30.4`
+    * `microutils`: `0.3.2` -> `0.3.3`
+
 ## 0.0.1
 
 Inited :)

README.md

@@ -1,28 +1,18 @@
-# Telegram Bot Template
+# PlaguBot
 
-That is template for telegram bots based on next stack of technologies:
+## For users
 
-* [Kotlin Coroutines](https://github.com/Kotlin/kotlinx.coroutines)
-* [Kotlin Serialization](https://github.com/Kotlin/kotlinx.serialization)
-* [Telegram Bot API Library](https://github.com/InsanusMokrassar/TelegramBotAPI) (by default everything is included like
-it was described [here](https://github.com/InsanusMokrassar/TelegramBotAPI#ok-where-should-i-start))
+Template: [![Use template](badges/use_template.svg)](https://github.com/InsanusMokrassar/PlaguBotBotTemplate/generate)
 
-## Default
+You can create your bot using
+[this template](https://insanusmokrassar.github.io/PlaguBotBotTemplate/) by following of its instructions
 
-Since you have used this repo as a template you can simply run command `./gradlew run --args="BOT_TOKEN"` (of course,
-replace here `BOT_TOKEN` with your telegram bot token like `1234567890:ABCDEFGHIJKLM_OPqrstuvwxyz012345678`). As an
-output you will get your bot information like:
+## For developers
 
-```bash
-ExtendedBot(id=ChatId(chatId=1234567890), username=Username(username=@username_of_your_bot), firstName=Name of bot, lastName=, canJoinGroups=(some boolean), canReadAllGroupMessages=(some boolean), supportsInlineQueries=(some boolean))
-```
+| Template: | [![Use template](badges/use_template.svg)](https://github.com/InsanusMokrassar/PlaguBotPluginTemplate/generate) |
+|-----------|-----------------------------------------------------------------------------------------------------------------|
+| Bot version: | [![Download](https://api.bintray.com/packages/insanusmokrassar/PlaguBot/plagubot.bot/images/download.svg)](https://bintray.com/insanusmokrassar/PlaguBot/plagubot.bot/_latestVersion) |
+| Plugin version: | [![Download](https://api.bintray.com/packages/insanusmokrassar/PlaguBot/plagubot.plugin/images/download.svg)](https://bintray.com/insanusmokrassar/PlaguBot/plagubot.plugin/_latestVersion) |
 
-## What next?
-
-There are several ways to continue:
-
-* [Tutorials](https://bookstack.inmo.dev/books/telegrambotapi)
-* [Github readme](https://github.com/InsanusMokrassar/TelegramBotAPI)
-
-In other words, this template (and [TelegramBotAPI library](https://github.com/InsanusMokrassar/TelegramBotAPI)) does
-not limit you on choosing of way to continue 😊
+That is a set of libraries for plagubots. Look at the
+[PlaguBot Plugin template](https://insanusmokrassar.github.io/PlaguBotPluginTemplate/) to find how to create your bot.

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

badges/use_template.svg

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M35 0h69v20H35z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Use</text>
+        <text x="175" y="140" transform="scale(.1)">Use</text>
+        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Template</text>
+        <text x="690" y="140" transform="scale(.1)">Template</text>
+    </g>
+</svg>

bot/build.gradle

@@ -12,19 +12,19 @@ apply from: "publish.gradle"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation "org.jetbrains.exposed:exposed-jdbc:$kotlin_exposed_version"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    api "org.jetbrains.exposed:exposed-jdbc:$kotlin_exposed_version"
 
-    implementation "dev.inmo:tgbotapi:$tgbotapi_version"
-    implementation "dev.inmo:micro_utils.repos.exposed:$microutils_version"
+    api "dev.inmo:tgbotapi:$tgbotapi_version"
+    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
 
-    implementation "com.github.matfax.klassindex:library:$klassindex_version"
+    api "com.github.matfax.klassindex:library:$klassindex_version"
     kapt "com.github.matfax.klassindex:processor:$klassindex_version"
-    implementation "org.xerial:sqlite-jdbc:$sqlite_version"
+    api "org.xerial:sqlite-jdbc:$sqlite_version"
 
-    implementation project(":plagubot.plugin")
+    api project(":plagubot.plugin")
 }
 
 application {

bot/maven.publish.gradle

@@ -1,54 +0,0 @@
-apply plugin: 'maven-publish'
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar) {
-    from javadoc
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom {
-                resolveStrategy = Closure.DELEGATE_FIRST
-
-                description = ""
-                name = "PlaguBot ${project.name}"
-                url = "https://github.com/InsanusMokrassar/PlaguBot"
-
-                scm {
-                    developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
-                    url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
-                }
-
-                developers {
-                    
-                        developer {
-                            id = "InsanusMokrassar"
-                            name = "Aleksei Ovsiannikov"
-                            email = "ovsyannikov.alexey95@gmail.com"
-                        }
-                    
-                }
-
-                licenses {
-                    
-                        license {
-                            name = "Apache Software License 2.0"
-                            url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE"
-                        }
-                    
-                }
-            }
-        }
-    }
-}

bot/publish.gradle

@@ -1,43 +1,66 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-ext {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
 }
 
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    publications = ["maven"]
-    filesSpec {
-        into "$projectBintrayDir"
-        from("build/libs") {
-            include "**/*.asc"
-        }
-        from("build/publications/maven") {
-            rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1"
-        }
-    }
-    
-    publish = true
-    override = true
-    
-    pkg {
-        repo = "PlaguBot"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+task javadocJar(type: Jar) {
+    from javadoc
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
+                description = ""
+                name = "PlaguBot ${project.name}"
+                url = "https://github.com/InsanusMokrassar/PlaguBot"
+
+                scm {
+                    developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
+                    url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
+                }
+
+                developers {
+                    
+                        developer {
+                            id = "InsanusMokrassar"
+                            name = "Aleksei Ovsiannikov"
+                            email = "ovsyannikov.alexey95@gmail.com"
+                        }
+                    
+                }
+
+                licenses {
+                    
+                        license {
+                            name = "Apache Software License 2.0"
+                            url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE"
+                        }
+                    
+                }
             }
+            
+                repositories {
+                    maven {
+                        name = "bintray"
+                        url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1")
+                        credentials {
+                            username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                            password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        }
+                    }
+                }
+            
         }
     }
-}
-
-apply from: "maven.publish.gradle"
-
-bintrayUpload.dependsOn publishToMavenLocal
+}

bot/src/main/kotlin/dev/inmo/plagubot/App.kt

@@ -11,17 +11,10 @@ import kotlinx.coroutines.*
 import kotlinx.serialization.InternalSerializationApi
 import java.io.File
 
-/**
- * This method by default expects one argument in [args] field: path to config
- */
-@InternalSerializationApi
-suspend fun main(args: Array<String>) {
-    val (configPath) = args
-    val file = File(configPath)
-    val config = configSerialFormat.decodeFromString(Config.serializer(), file.readText())
-
-    val scope = CoroutineScope(Dispatchers.Default)
-
+suspend inline fun initPlaguBot(
+    config: Config,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+) {
     val bot = telegramBot(config.botToken)
 
     bot.startGettingFlowsUpdatesByLongPolling(scope = scope) {
@@ -41,6 +34,18 @@ suspend fun main(args: Array<String>) {
             }
         }
     }
+}
 
+/**
+ * This method by default expects one argument in [args] field: path to config
+ */
+@InternalSerializationApi
+suspend fun main(args: Array<String>) {
+    val (configPath) = args
+    val file = File(configPath)
+    val config = configSerialFormat.decodeFromString(Config.serializer(), file.readText())
+
+    val scope = CoroutineScope(Dispatchers.Default)
+    initPlaguBot(config, scope)
     scope.coroutineContext.job.join()
 }

build.gradle

@@ -7,7 +7,6 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
         classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
     }
 }

github_release.gradle

@@ -18,6 +18,8 @@ if (new File(projectDir, "secret.gradle").exists()) {
     githubRelease {
         token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
+        releaseAssets.from('bot/build/distributions')
+
         owner "InsanusMokrassar"
         repo "PlaguBot"
 

gradle.properties

@@ -4,17 +4,16 @@ org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 
-kotlin_version=1.4.10
-kotlin_coroutines_version=1.4.1
+kotlin_version=1.4.21
+kotlin_coroutines_version=1.4.2
 kotlin_serialisation_runtime_version=1.0.1
 kotlin_exposed_version=0.28.1
-tgbotapi_version=0.30.3
-microutils_version=0.3.2
+tgbotapi_version=0.30.10
+microutils_version=0.4.11
 klassindex_version=4.1.0-rc.1
 sqlite_version=3.30.1
 
-gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12
 
 group=dev.inmo
-version=0.0.1
+version=0.0.5

plugin/build.gradle

@@ -10,8 +10,8 @@ apply from: "publish.gradle"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
 
-    implementation "dev.inmo:tgbotapi:$tgbotapi_version"
-    implementation "dev.inmo:micro_utils.repos.exposed:$microutils_version"
+    api "dev.inmo:tgbotapi:$tgbotapi_version"
+    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
 }

plugin/maven.publish.gradle

@@ -1,54 +0,0 @@
-apply plugin: 'maven-publish'
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar) {
-    from javadoc
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom {
-                resolveStrategy = Closure.DELEGATE_FIRST
-
-                description = ""
-                name = "PlaguBot ${project.name}"
-                url = "https://github.com/InsanusMokrassar/PlaguBot"
-
-                scm {
-                    developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
-                    url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
-                }
-
-                developers {
-                    
-                        developer {
-                            id = "InsanusMokrassar"
-                            name = "Aleksei Ovsiannikov"
-                            email = "ovsyannikov.alexey95@gmail.com"
-                        }
-                    
-                }
-
-                licenses {
-                    
-                        license {
-                            name = "Apache Software License 2.0"
-                            url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE"
-                        }
-                    
-                }
-            }
-        }
-    }
-}

plugin/publish.gradle

@@ -1,43 +1,66 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-ext {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
 }
 
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    publications = ["maven"]
-    filesSpec {
-        into "$projectBintrayDir"
-        from("build/libs") {
-            include "**/*.asc"
-        }
-        from("build/publications/maven") {
-            rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1"
-        }
-    }
-    
-    publish = true
-    override = true
-    
-    pkg {
-        repo = "PlaguBot"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+task javadocJar(type: Jar) {
+    from javadoc
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
+                description = ""
+                name = "PlaguBot ${project.name}"
+                url = "https://github.com/InsanusMokrassar/PlaguBot"
+
+                scm {
+                    developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
+                    url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git"
+                }
+
+                developers {
+                    
+                        developer {
+                            id = "InsanusMokrassar"
+                            name = "Aleksei Ovsiannikov"
+                            email = "ovsyannikov.alexey95@gmail.com"
+                        }
+                    
+                }
+
+                licenses {
+                    
+                        license {
+                            name = "Apache Software License 2.0"
+                            url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE"
+                        }
+                    
+                }
             }
+            
+                repositories {
+                    maven {
+                        name = "bintray"
+                        url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1")
+                        credentials {
+                            username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                            password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        }
+                    }
+                }
+            
         }
     }
-}
-
-apply from: "maven.publish.gradle"
-
-bintrayUpload.dependsOn publishToMavenLocal
+}