update publish scripts

0.0.13

.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

README.md

@@ -3,5 +3,5 @@
 This project was created due to neccessity of additional libraries over [tgbotapi](https://github.com/InsanusMokrassar/TelegramBotAPI).
 Currently there are plans to create several libraries at the start of this project:
 
-* Cache library for media (saving and autorefreshing of `fileId`)
-* Cache library for admins (saving chat admins, autoupdate and refreshing by command (maybe))
+* Cache library for media (saving and autorefreshing of `fileId`) (**currently in TBD state**)
+* Cache library for admins (saving chat admins, autoupdate and refreshing by command (maybe)) (you may retrieve it using github packages for now)

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.0.2'
+        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))
     }
 }

gradle.properties

@@ -6,32 +6,32 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.4.32
-kotlin_serialisation_core_version=1.1.0
+kotlin_version=1.6.10
+kotlin_serialisation_core_version=1.3.2
 
 github_release_plugin_version=2.2.12
 
-tgbotapi_version=0.34.0
-micro_utils_version=0.4.36
-exposed_version=0.31.1
-plagubot_version=0.2.0
+tgbotapi_version=0.38.0
+micro_utils_version=0.9.0
+exposed_version=0.37.2
+plagubot_version=0.5.0
 
 # ANDROID
 
 android_minSdkVersion=21
-android_compileSdkVersion=30
-android_buildToolsVersion=30.0.2
-dexcount_version=2.0.0
+android_compileSdkVersion=32
+android_buildToolsVersion=32.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.20
+dokka_version=1.6.0
 
 # Project data
 
 group=dev.inmo
-version=0.0.7
-android_code_version=6
+version=0.0.15
+android_code_version=14

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

mppAndroidProject.gradle

@@ -1,4 +1,4 @@
-project.version = "$version" + System.getenv("additional_version")
+project.version = "$version"
 project.group = "$group"
 
 apply from: "$publishGradlePath"

mppJavaProject.gradle

@@ -1,4 +1,4 @@
-project.version = "$version" + System.getenv("additional_version")
+project.version = "$version"
 project.group = "$group"
 
 apply from: "$publishGradlePath"
@@ -28,3 +28,8 @@ kotlin {
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

mppProjectWithSerialization.gradle

@@ -4,10 +4,8 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm {
-        compilations.main.kotlinOptions.useIR = true
-    }
-    js (BOTH) {
+    jvm()
+    js (IR) {
         browser()
         nodejs()
     }
@@ -49,4 +47,9 @@ kotlin {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 apply from: "$defaultAndroidSettingsPresetPath"

publish.gradle

@@ -38,6 +38,7 @@ publishing {
             }
         }
         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/TelegramBotApiLibraries")
@@ -47,5 +48,26 @@ publishing {
                     }
                 }
             }
+            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
     }
 }

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"}]}}