Update libs.versions.toml

0.32.5 Update

.github/workflows/build.yml

@@ -8,9 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build with Gradle
         run: ./gradlew build

Dockerfile

@@ -0,0 +1,9 @@
+FROM adoptopenjdk/openjdk11
+
+USER 1000
+
+VOLUME /config.json
+
+ENTRYPOINT ["/telegram_bot/bin/telegram_bot", "TOKEN"]
+
+ADD ./build/distributions/telegram_bot.tar /

Makefile

@@ -0,0 +1,19 @@
+#!make
+
+.ONESHELL:
+.PHONY:
+
+clean:
+	./gradlew clean
+
+build:
+	./gradlew build
+
+start:
+	./gradlew run
+
+startCompose:
+	docker-compose build && docker-compose up
+
+buildAndStartCompose:
+	make clean build startCompose

README.md

@@ -17,6 +17,13 @@ output you will get your bot information like:
 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))
 ```
 
+### Docker
+
+In this template there is template-like [docker-compose](docker-compose.yml) and [docker](Dockerfile) files. Besides,
+there is [Makefile](Makefile) and you may use something like `make buildAndStartCompose` to start your bot.
+
+It is important to replace `"TOKEN"` in [Dockerfile](Dockerfile) or remove and add some config as a volume.
+
 ## What next?
 
 There are several ways to continue:

build.gradle

@@ -1,31 +1,35 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath libs.kotlin.gradle.plugin
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath libs.kotlin.serialization.plugin
     }
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "$kotlin_version"
+    alias libs.plugins.kotlin.jvm
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    alias libs.plugins.kotlin.serialization
     id 'application'
 }
 
 repositories {
-    jcenter()
     mavenCentral()
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation libs.kotlin
 
-    implementation "dev.inmo:tgbotapi:$tgbotapi_version"
+    implementation libs.tgbotapi
 }
 
 application {
     mainClassName = 'telegram_bot.AppKt'
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}

docker-compose.yml

@@ -0,0 +1,6 @@
+version: "3.4"
+
+services:
+  server:
+    build: .
+    restart: unless-stopped

gradle.properties

@@ -3,6 +3,3 @@ kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
-
-kotlin_version=1.4.30
-tgbotapi_version=0.32.5

gradle/libs.versions.toml

@@ -0,0 +1,19 @@
+[versions]
+
+kotlin = "1.6.10"
+tgbotapi = "0.38.12"
+
+[libraries]
+
+kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
+
+# Libs for classpath
+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" }
+
+[plugins]
+
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1,3 @@
 rootProject.name = 'telegram_bot'
+
+enableFeaturePreview("VERSION_CATALOGS")

src/main/kotlin/telegram_bot/App.kt

@@ -3,7 +3,7 @@ package telegram_bot
 import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
+import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import kotlinx.coroutines.*
 
@@ -18,7 +18,7 @@ suspend fun main(args: Array<String>) {
     val scope = CoroutineScope(Dispatchers.Default)
 
     // here should be main logic of your bot
-    bot.buildBehaviour(scope) {
+    bot.buildBehaviourWithLongPolling(scope) {
         // in this lambda you will be able to call methods without "bot." prefix
         val me = getMe()
 
@@ -27,7 +27,9 @@ suspend fun main(args: Array<String>) {
             // simply reply :)
             reply(it, "Hello, I am ${me.firstName}")
         }
-    }
 
-    scope.coroutineContext.job.join()
+        // That will be called on the end of bot initiation. After that prinln will be started long polling and bot will
+        // react on your commands
+        println(me)
+    }.join()
 }