Update gradle.properties

0.0.15

.github/workflows/commit-publish.yml

@@ -7,7 +7,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
+      - name: Fix android 32.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

.gitignore

@@ -11,5 +11,6 @@ out/
 
 secret.gradle
 local.properties
+kotlin-js-store/
 
 publishing.sh

build.gradle

@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        jcenter()
         google()
         mavenCentral()
         mavenLocal()
@@ -8,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
@@ -19,10 +18,8 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
         google()
-        maven { url "https://kotlin.bintray.com/kotlinx" }
     }
 }
 

cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt

@@ -51,12 +51,12 @@ class DefaultAdminsCacheAPIRepo(
     }
 
     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? = suspendCoroutine {
-        actor.offer(GetChatAdminsRepoAction(chatId, it))
+        actor.trySend(GetChatAdminsRepoAction(chatId, it))
     }
     override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) = suspendCoroutine<Unit> {
-        actor.offer(SetChatAdminsRepoAction(chatId, chatMembers, it))
+        actor.trySend(SetChatAdminsRepoAction(chatId, chatMembers, it))
     }
     override suspend fun lastUpdate(chatId: ChatId): DateTime? = suspendCoroutine {
-        actor.offer(GetUpdateDateTimeRepoAction(chatId, it))
+        actor.trySend(GetUpdateDateTimeRepoAction(chatId, it))
     }
 }

fsm/core/build.gradle

@@ -1,17 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
-            }
-        }
-    }
-}

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/State.kt

@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core
-
-sealed interface State {
-    val context: Any
-}
-
-/**
- * Use this state as parent of your state in case you want to avoid saving of this state in queue for [context] if this
- * queue is not empty
- */
-interface ImmediateOrNeverState : State
-
-/**
- * Use this state as parent of your state in case you want to keep saving of this state in queue for [context] if this
- * queue is not empty
- */
-interface QueueableState : State

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/StateHandlerHolder.kt

@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core
-
-import kotlin.reflect.KClass
-
-class StateHandlerHolder<I : State>(
-    private val inputKlass: KClass<I>,
-    private val strict: Boolean = false,
-    private val delegateTo: StatesHandler<I>
-) : StatesHandler<State> {
-    fun checkHandleable(state: State) = state::class == inputKlass || (!strict && inputKlass.isInstance(state))
-
-    override suspend fun StatesMachine.handleState(state: State): State? {
-        return delegateTo.run { handleState(state as I) }
-    }
-}

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/StatesHandler.kt

@@ -1,5 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core
-
-fun interface StatesHandler<I : State> {
-    suspend fun StatesMachine.handleState(state: I): State?
-}

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/StatesMachine.kt

@@ -1,46 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core
-
-import dev.inmo.micro_utils.coroutines.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.asFlow
-
-private suspend fun <I : State> StatesMachine.launchStateHandling(
-    state: State,
-    handlers: List<StateHandlerHolder<out I>>
-): State? {
-    return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
-        handleState(state)
-    }
-}
-
-class StatesMachine (
-    private val statesManager: StatesManager,
-    private val handlers: List<StateHandlerHolder<*>>
-) : StatesHandler<State> {
-    override suspend fun StatesMachine.handleState(state: State): State? = launchStateHandling(state, handlers)
-
-    fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions {
-        val statePerformer: suspend (State) -> Unit = { state: State ->
-            val newState = launchStateHandling(state, handlers)
-            if (newState != null) {
-                statesManager.update(state, newState)
-            } else {
-                statesManager.endChain(state)
-            }
-        }
-        statesManager.onStartChain.subscribeSafelyWithoutExceptions(this) {
-            launch { statePerformer(it) }
-        }
-        statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) {
-            launch { statePerformer(it.second) }
-        }
-
-        statesManager.getActiveStates().forEach {
-            launch { statePerformer(it) }
-        }
-    }
-
-    suspend fun startChain(state: State) {
-        statesManager.startChain(state)
-    }
-}

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/StatesManager.kt

@@ -1,92 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core
-
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-interface StatesManager {
-    val onChainStateUpdated: Flow<Pair<State, State>>
-    val onStartChain: Flow<State>
-    val onEndChain: Flow<State>
-
-
-    /**
-     * Must set current set using [State.context]
-     */
-    suspend fun update(old: State, new: State)
-
-    /**
-     * Starts chain with [state] as first [State]. May returns false in case of [State.context] of [state] is already
-     * busy by the other [State]
-     */
-    suspend fun startChain(state: State)
-
-    /**
-     * Ends chain with context from [state]. In case when [State.context] of [state] is absent, [state] should be just
-     * ignored
-     */
-    suspend fun endChain(state: State)
-
-    suspend fun getActiveStates(): List<State>
-}
-
-/**
- * @param onContextsConflictResolver Receive old [State], new one and the state currently placed on new [State.context]
- * key. In case when this callback will returns true, the state placed on [State.context] of new will be replaced by
- * new state by using [endChain] with that state
- */
-class InMemoryStatesManager(
-    private val onContextsConflictResolver: suspend (old: State, new: State, currentNew: State) -> Boolean = { _, _, _ -> true }
-) : StatesManager {
-    private val _onChainStateUpdated = MutableSharedFlow<Pair<State, State>>(0)
-    override val onChainStateUpdated: Flow<Pair<State, State>> = _onChainStateUpdated.asSharedFlow()
-    private val _onStartChain = MutableSharedFlow<State>(0)
-    override val onStartChain: Flow<State> = _onStartChain.asSharedFlow()
-    private val _onEndChain = MutableSharedFlow<State>(0)
-    override val onEndChain: Flow<State> = _onEndChain.asSharedFlow()
-
-    private val contextsToStates = mutableMapOf<Any, State>()
-    private val mapMutex = Mutex()
-
-    override suspend fun update(old: State, new: State) = mapMutex.withLock {
-        when {
-            contextsToStates[old.context] != old -> return@withLock
-            old.context == new.context || !contextsToStates.containsKey(new.context) -> {
-                contextsToStates[old.context] = new
-                _onChainStateUpdated.emit(old to new)
-            }
-            else -> {
-                val stateOnNewOneContext = contextsToStates.getValue(new.context)
-                if (onContextsConflictResolver(old, new, stateOnNewOneContext)) {
-                    endChainWithoutLock(stateOnNewOneContext)
-                    contextsToStates.remove(old.context)
-                    contextsToStates[new.context] = new
-                    _onChainStateUpdated.emit(old to new)
-                }
-            }
-        }
-    }
-
-    override suspend fun startChain(state: State) = mapMutex.withLock {
-        if (!contextsToStates.containsKey(state.context)) {
-            contextsToStates[state.context] = state
-            _onStartChain.emit(state)
-        }
-    }
-
-    private suspend fun endChainWithoutLock(state: State) {
-        if (contextsToStates[state.context] == state) {
-            contextsToStates.remove(state.context)
-            _onEndChain.emit(state)
-        }
-    }
-
-    override suspend fun endChain(state: State) {
-        mapMutex.withLock {
-            endChainWithoutLock(state)
-        }
-    }
-
-    override suspend fun getActiveStates(): List<State> = contextsToStates.values.toList()
-
-}

fsm/core/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/fsm/core/dsl/FSMBuilder.kt

@@ -1,35 +0,0 @@
-package dev.inmo.tgbotapi.libraries.fsm.core.dsl
-
-import dev.inmo.tgbotapi.libraries.fsm.core.*
-import kotlin.reflect.KClass
-
-class FSMBuilder(
-    var statesManager: StatesManager = InMemoryStatesManager()
-) {
-    private var states = mutableListOf<StateHandlerHolder<*>>()
-
-    fun <I : State> add(kClass: KClass<I>, handler: StatesHandler<I>) {
-        states.add(StateHandlerHolder(kClass, false, handler))
-    }
-
-    fun <I : State> addStrict(kClass: KClass<I>, handler: StatesHandler<I>) {
-        states.add(StateHandlerHolder(kClass, true, handler))
-    }
-
-    fun build() = StatesMachine(
-        statesManager,
-        states.toList()
-    )
-}
-
-inline fun <reified I : State> FSMBuilder.onStateOrSubstate(handler: StatesHandler<I>) {
-    add(I::class, handler)
-}
-
-inline fun <reified I : State> FSMBuilder.strictlyOn(handler: StatesHandler<I>) {
-    addStrict(I::class, handler)
-}
-
-fun buildFSM(
-    block: FSMBuilder.() -> Unit
-): StatesMachine = FSMBuilder().apply(block).build()

fsm/core/src/jvmTest/kotlin/PlayableMain.kt

@@ -1,54 +0,0 @@
-import dev.inmo.tgbotapi.libraries.fsm.core.*
-import dev.inmo.tgbotapi.libraries.fsm.core.dsl.buildFSM
-import dev.inmo.tgbotapi.libraries.fsm.core.dsl.strictlyOn
-import kotlinx.coroutines.*
-import kotlin.random.Random
-import kotlin.test.Test
-
-sealed interface TrafficLightState : ImmediateOrNeverState {
-    val trafficLightNumber: Int
-    override val context: Int
-        get() = trafficLightNumber
-}
-data class GreenCommon(override val trafficLightNumber: Int) : TrafficLightState
-data class YellowCommon(override val trafficLightNumber: Int) : TrafficLightState
-data class RedCommon(override val trafficLightNumber: Int) : TrafficLightState
-
-class PlayableMain {
-    fun test() {
-        runBlocking {
-            val countOfTrafficLights = 10
-            val initialStates = (0 until countOfTrafficLights).map {
-                when (0/*Random.nextInt(3)*/) {
-                    0 -> GreenCommon(it)
-                    1 -> YellowCommon(it)
-                    else -> RedCommon(it)
-                }
-            }
-
-            val statesManager = InMemoryStatesManager()
-
-            val machine = buildFSM {
-                strictlyOn<GreenCommon> {
-                    delay(1000L)
-                    YellowCommon(it.context).also(::println)
-                }
-                strictlyOn<YellowCommon> {
-                    delay(1000L)
-                    RedCommon(it.context).also(::println)
-                }
-                strictlyOn<RedCommon> {
-                    delay(1000L)
-                    GreenCommon(it.context).also(::println)
-                }
-                this.statesManager = statesManager
-            }
-
-            initialStates.forEach { machine.startChain(it) }
-
-            val scope = CoroutineScope(Dispatchers.Default)
-            machine.start(scope).join()
-
-        }
-    }
-}

fsm/core/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.fsm.core"/>

fsm/tgbotapi/build.gradle

@@ -1,17 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api project(":tgbotapi.libraries.fsm.core")
-            }
-        }
-    }
-}

fsm/tgbotapi/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.fsm.tgbotapi"/>

gradle.properties

@@ -6,33 +6,32 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.5.10
+kotlin_version=1.6.10
-kotlin_serialisation_core_version=1.2.1
+kotlin_serialisation_core_version=1.3.2
-kotlin_coroutines_version=1.5.0
 
 github_release_plugin_version=2.2.12
 
-tgbotapi_version=0.35.0
+tgbotapi_version=0.38.4
-micro_utils_version=0.5.12
+micro_utils_version=0.9.5
-exposed_version=0.32.1
+exposed_version=0.37.2
-plagubot_version=0.3.0
+plagubot_version=0.5.1
 
 # ANDROID
 
 android_minSdkVersion=21
-android_compileSdkVersion=30
+android_compileSdkVersion=32
-android_buildToolsVersion=30.0.3
+android_buildToolsVersion=32.0.0
-dexcount_version=2.0.0
+dexcount_version=3.0.1
 junit_version=4.12
 test_ext_junit_version=1.1.2
 espresso_core=3.3.0
 
 # Dokka
 
-dokka_version=1.4.32
+dokka_version=1.6.10
 
 # Project data
 
 group=dev.inmo
-version=0.0.10
+version=0.0.16
-android_code_version=9
+android_code_version=16

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.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mppJavaProject.gradle

@@ -28,3 +28,8 @@ kotlin {
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

mppProjectWithSerialization.gradle

@@ -47,4 +47,9 @@ kotlin {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 apply from: "$defaultAndroidSettingsPresetPath"

publish.gradle

@@ -38,14 +38,42 @@ publishing {
             }
         }
         repositories {
-            maven {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                name = "GithubPackages"
+                maven {
-                url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
+                    name = "GithubPackages"
-                credentials {
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
-                    username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                    credentials {
-                    password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                        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')
+                    }
                 }
             }
         }
     }
 }
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}

publish.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

publish_config.kpsb

@@ -1 +0,0 @@
-{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","includeGpgSigning":false,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"}]}}

settings.gradle

@@ -4,10 +4,7 @@ String[] includes = [
     ":cache:admins:common",
     ":cache:admins:micro_utils",
     ":cache:admins:plagubot",
-    ":cache:media",
+    ":cache:media"
-
-    ":fsm:core",
-    ":fsm:tgbotapi"
 ]