Compare commits

...

14 Commits

7 changed files with 32 additions and 17 deletions

View File

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

View File

@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.2'
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"

View File

@@ -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))
}
}

View File

@@ -6,32 +6,32 @@ kotlin.incremental.js=true
android.useAndroidX=true
android.enableJetifier=true
kotlin_version=1.5.10
kotlin_serialisation_core_version=1.2.1
kotlin_version=1.5.31
kotlin_serialisation_core_version=1.3.1
github_release_plugin_version=2.2.12
tgbotapi_version=0.35.0
micro_utils_version=0.5.12
exposed_version=0.32.1
plagubot_version=0.3.0
tgbotapi_version=0.37.0
micro_utils_version=0.8.2
exposed_version=0.36.1
plagubot_version=0.4.0
# ANDROID
android_minSdkVersion=21
android_compileSdkVersion=30
android_buildToolsVersion=30.0.3
dexcount_version=2.0.0
android_compileSdkVersion=31
android_buildToolsVersion=31.0.0
dexcount_version=3.0.0
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.5.31
# Project data
group=dev.inmo
version=0.0.10
android_code_version=9
version=0.0.13
android_code_version=12

View File

@@ -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

View File

@@ -28,3 +28,9 @@ kotlin {
}
}
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
}
}

View File

@@ -47,4 +47,10 @@ kotlin {
}
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
}
}
apply from: "$defaultAndroidSettingsPresetPath"