Merge pull request #14 from InsanusMokrassar/0.1.0

0.1.0

.github/workflows/docker-publish.yml

@@ -1,8 +1,7 @@
 name: Docker
-on:
+
-  push:
+on: [push]
-    branches:
+
-      - master
 jobs:
   publishing:
     runs-on: ubuntu-latest
@@ -12,6 +11,14 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Rewrite version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          if [[ "$branch" != "master" ]]; then
+            cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
+            rm gradle.properties
+            mv gradle.properties.tmp gradle.properties
+          fi
       - name: Log into registry
         uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
         with:

common/src/commonMain/kotlin/DateTimeSerializer.kt

@@ -8,7 +8,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
-@Serializer(DateTime::class)
 object DateTimeSerializer : KSerializer<DateTime> {
     override val descriptor: SerialDescriptor = Double.serializer().descriptor
     override fun deserialize(decoder: Decoder): DateTime = DateTime(decoder.decodeDouble())

gradle.properties

@@ -10,4 +10,4 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.0.10
+version=0.1.0

gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
 
-kotlin = "1.7.22"
+kotlin = "1.8.10"
-kotlin-serialization = "1.4.1"
+kotlin-serialization = "1.5.0"
 
-plagubot = "3.5.0"
+plagubot = "5.0.0"
-tgbotapi = "5.2.1"
+tgbotapi = "7.0.0"
-microutils = "0.16.11"
+microutils = "0.17.5"
-kslog = "0.5.4"
+kslog = "1.0.0"
-krontab = "0.8.5"
+krontab = "0.9.0"
-tgbotapi-libraries = "0.8.2"
+tgbotapi-libraries = "0.10.0"
-plagubot-plugins = "0.8.1"
+plagubot-plugins = "0.10.0"
 
-dokka = "1.7.20"
+dokka = "1.8.10"
 
 psql = "42.5.0"
 

posts_registrar/src/jvmMain/kotlin/Plugin.kt

@@ -21,7 +21,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.text
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage

runner/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM bellsoft/liberica-openjdk-alpine:19
 
 USER 1000
 

runner/deploy.sh

@@ -14,7 +14,7 @@ function assert_success() {
 }
 
 app=plaguposter
-version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`"
+version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
 server=docker.io/insanusmokrassar
 
 assert_success ../gradlew build

runner/nonsudo_deploy.sh

@@ -14,7 +14,7 @@ function assert_success() {
 }
 
 app=plaguposter
-version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`"
+version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
 server=insanusmokrassar
 
 assert_success ../gradlew build