1.9.0

.github/workflows/publish_packages.yml

@@ -0,0 +1,22 @@
+
+name: Publish package to GitHub Packages
+on: [push]
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Update version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          sed -i -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" gradle.properties
+      - name: prebuild
+        run: ./gradlew clean build
+      - name: Publish package
+        run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signMavenPublication
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Auto Post Telegram Bot Changelog
 
+## 1.9.0
+
+* Versions updates:
+    * Kotlin: `1.3.61` -> `1.3.72`
+    * Coroutines: `1.3.3` -> `1.3.8`
+    * Kotlin Serialization: `0.14.0` -> `0.20.0`
+    * `TelegramBotAPI` -> `TelegramBotAPI-all` + version change: `0.23.2` -> `0.27.10`
+    * Ktor: `1.3.1` -> `1.3.2`
+* `BroadcastChannel` and `ReceiveChannel` extensions were removed
+* Transaction flows added
+
 ## 1.8.0
 
 * Version updates:
@@ -8,6 +19,10 @@
 * `TimerTriggerStrategy` now have new extension `getPostsInRange` and `getTriggersInRange`
 * `MostRatedChooser` now correctly work with exceptions list
 
+### 1.8.3
+
+* Hotfix for scheduler plugin and its table
+
 ### 1.8.2
 
 * `DatabaseConfig#connect` now is deprecated. It is recommended to use `DatabaseConfig#database` property

build.gradle

@@ -1,6 +1,3 @@
-project.version = "1.8.2"
-project.group = "com.github.insanusmokrassar"
-
 buildscript {
     repositories {
         mavenLocal()
@@ -11,7 +8,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"
     }
 }
 
@@ -20,9 +16,12 @@ apply plugin: 'application'
 apply plugin: 'kotlin'
 apply plugin: 'kotlinx-serialization'
 
+project.version = "$version"
+project.group = "dev.inmo"
+
 apply from: "publish.gradle"
 
-mainClassName="com.github.insanusmokrassar.AutoPostTelegramBot.LaunchKt"
+mainClassName="dev.inmo.AutoPostTelegramBot.LaunchKt"
 
 repositories {
     mavenLocal()
@@ -35,14 +34,16 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
-    api "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+    api "dev.inmo:tgbotapi:$telegram_bot_api_version"
 
     implementation "io.ktor:ktor-server-cio:$ktor_version"
     implementation "io.ktor:ktor-client-okhttp:$ktor_version"
 
-    api "org.jetbrains.exposed:exposed:$kotlin_exposed_version"
+    api "org.jetbrains.exposed:exposed-jdbc:$kotlin_exposed_version"
+    api "org.jetbrains.exposed:exposed-jodatime:$kotlin_exposed_version"
     implementation "com.h2database:h2:$h2_version"
+    api "joda-time:joda-time:$joda_time_version"
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'

gradle.properties

@@ -1,11 +1,12 @@
 kotlin.code.style=official
-kotlin_version=1.3.61
-kotlin_coroutines_version=1.3.3
-kotlin_serialisation_runtime_version=0.14.0
-kotlin_exposed_version=0.10.2
-telegram_bot_api_version=0.23.2
-ktor_version=1.3.1
+kotlin_version=1.5.20
+kotlin_coroutines_version=1.5.0
+kotlin_serialisation_runtime_version=1.2.1
+kotlin_exposed_version=0.32.1
+telegram_bot_api_version=0.35.1
+ktor_version=1.6.1
+joda_time_version=2.10.10
 
-h2_version=1.4.196
+h2_version=1.4.200
 
-gradle_bintray_plugin_version=1.8.4
+version=1.9.0

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

publish.gradle

@@ -1,37 +1,82 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
-ext {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
+
+task javadocJar(type: Jar) {
+    from javadoc
+    classifier = 'javadoc'
+}
+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"
-        }
-    }
-    pkg {
-        repo = 'StandardRepository'
-        name = "${project.name}"
-        vcsUrl = "https://github.com/InsanusMokrassar/${project.name}"
-        licenses = ['Apache-2.0']
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = name
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+
+            artifact javadocJar
+            artifact sourcesJar
+
+            pom {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
+                description = "It is base library for creating smart bot for simple management of channels posts"
+                name = "Auto post Telegram Bot"
+                url = "https://insanusmokrassar.github.io/AutoPostTelegramBot"
+
+                scm {
+                    developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/AutoPostTelegramBot[push=]https://github.com/insanusmokrassar/AutoPostTelegramBot"
+                    url = "https://github.com/insanusmokrassar/AutoPostTelegramBot"
+                }
+
+                developers {
+
+                        developer {
+                            id = "InsanusMokrassar"
+                            name = "Ovsyannikov Alexey"
+                            email = "ovsyannikov.alexey95@gmail.com"
+                        }
+
+                }
+
+                licenses {
+
+                        license {
+                            name = "Apache Software License 2.0"
+                            url = "https://github.com/InsanusMokrassar/${project.name}/blob/master/LICENSE"
+                        }
+
+                }
+            }
+            repositories {
+                if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                    maven {
+                        name = "GithubPackages"
+                        url = uri("https://maven.pkg.github.com/InsanusMokrassar/AutoPostTelegramBot")
+                        credentials {
+                            username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                            password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                        }
+                    }
+                }
+                if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                    maven {
+                        name = "sonatype"
+                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                        credentials {
+                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                        }
+                    }
+                }
             }
         }
     }
 }
 
-apply from: "maven.publish.gradle"
+signing {
+    useGpgCmd()
+    sign publishing.publications
+}

publish_config.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/${project.name}/blob/master/LICENSE"}],"mavenConfig":{"name":"Auto post Telegram Bot","description":"It is base library for creating smart bot for simple management of channels posts","url":"https://insanusmokrassar.github.io/AutoPostTelegramBot","vcsUrl":"https://github.com/insanusmokrassar/AutoPostTelegramBot","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/AutoPostTelegramBot"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]},"type":"JVM"}

settings.gradle

@@ -15,4 +15,4 @@ include 'api'
 include 'services:webservice'
 */
 
-rootProject.name = 'AutoPostTelegramBot'
+rootProject.name = 'autoposttelegrambot'