diff --git a/.github/workflows/commit-publish.yml b/.github/workflows/commit-publish.yml index 1b40f18..ec75432 100644 --- a/.github/workflows/commit-publish.yml +++ b/.github/workflows/commit-publish.yml @@ -7,10 +7,10 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 1.8 - - name: Fix android 31.0.0 dx + java-version: 11 + - name: Fix android 32.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 + 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 "[^/]*$"`" diff --git a/.gitignore b/.gitignore index 8a04b36..035f388 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,6 @@ out/ secret.gradle local.properties +kotlin-js-store/ publishing.sh diff --git a/build.gradle b/build.gradle index abb059b..a2d3838 100644 --- a/build.gradle +++ b/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.2.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" } } } diff --git a/gradle.properties b/gradle.properties index bc800fa..4c5d9e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,32 +6,32 @@ kotlin.incremental.js=true android.useAndroidX=true android.enableJetifier=true -kotlin_version=1.5.31 -kotlin_serialisation_core_version=1.3.1 +kotlin_version=1.6.10 +kotlin_serialisation_core_version=1.3.2 github_release_plugin_version=2.2.12 -tgbotapi_version=0.37.0 -micro_utils_version=0.8.2 -exposed_version=0.36.1 -plagubot_version=0.4.1 +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=31 -android_buildToolsVersion=31.0.0 -dexcount_version=3.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.5.31 +dokka_version=1.6.0 # Project data group=dev.inmo -version=0.0.14 -android_code_version=13 +version=0.0.15 +android_code_version=14 diff --git a/publish.gradle b/publish.gradle index 6cfed12..788128f 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,5 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' @@ -62,8 +61,13 @@ publishing { } } } - -signing { - useGpgCmd() - sign publishing.publications -} + +if (project.hasProperty("signing.gnupg.keyName")) { + apply plugin: 'signing' + + signing { + useGpgCmd() + + sign publishing.publications + } +} \ No newline at end of file diff --git a/publish.kpsb b/publish.kpsb new file mode 100644 index 0000000..f674888 --- /dev/null +++ b/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"}}} \ No newline at end of file diff --git a/publish_config.kpsb b/publish_config.kpsb deleted file mode 100644 index b3b6bbb..0000000 --- a/publish_config.kpsb +++ /dev/null @@ -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":true,"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/"}]}} \ No newline at end of file