From 496d4cf100469ea7cd52418b77b8b9d50b9afbd4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 20:19:03 +0600 Subject: [PATCH 1/9] start 0.5.1 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e1b9a..890d471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.1 + ## 0.5.0 Years **BREAKING CHANGES** diff --git a/gradle.properties b/gradle.properties index 08a17e7..7ec8bb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,6 +33,6 @@ androidx_work_version=2.4.0 ## Common -version=0.5.0 -android_code_version=1 +version=0.5.1 +android_code_version=2 From ec85fd77f91162aec6b276bdb603cb2cb33a29cb Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 20:22:55 +0600 Subject: [PATCH 2/9] update dependencies --- CHANGELOG.md | 6 ++++++ gradle.properties | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 890d471..3400205 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 0.5.1 +* Versions + * `Kotlin`: `1.4.21` -> `1.4.31` + * `Coroutines`: `1.4.2` -> `1.4.3` + * `Klock`: `2.0.3` -> `2.0.7` + * `Androidx Work`: `2.4.0` -> `2.5.0` + ## 0.5.0 Years **BREAKING CHANGES** diff --git a/gradle.properties b/gradle.properties index 7ec8bb8..06a6ce4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=1.4.21 -kotlin_coroutines_version=1.4.2 +kotlin_version=1.4.31 +kotlin_coroutines_version=1.4.3 dokka_version=1.4.20 -klockVersion=2.0.3 +klockVersion=2.0.7 ## Github reease @@ -29,7 +29,7 @@ junit_version=4.12 test_ext_junit_version=1.1.2 espresso_core=3.3.0 -androidx_work_version=2.4.0 +androidx_work_version=2.5.0 ## Common From 092fc6bc9b90c18aa48b5734de435bde83fcc2b9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 20:23:15 +0600 Subject: [PATCH 3/9] update gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2238b10..fe27adb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip From 9ce69efad5ee7b82850bbe33c6f113d745b3a7ba Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 20:30:02 +0600 Subject: [PATCH 4/9] update publishing scripts --- mpp_config.kpsb | 2 +- publish.gradle | 58 ++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mpp_config.kpsb b/mpp_config.kpsb index 5f442c0..6003195 100644 --- a/mpp_config.kpsb +++ b/mpp_config.kpsb @@ -1 +1 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}-mpp","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","vcsUrl":"https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 079695d..b149f7b 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,24 +1,9 @@ apply plugin: 'maven-publish' +apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' } -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} publishing { publications.all { @@ -27,11 +12,11 @@ publishing { pom { description = "It is an analog of crontab util for Kotlin Coroutines" name = "Krontab" - url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab" + url = "https://github.com/InsanusMokrassar/krontab" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git[push=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git" - url = "https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git" + developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/krontab.git[push=]https://github.com/InsanusMokrassar/krontab.git" + url = "https://github.com/InsanusMokrassar/krontab.git" } developers { @@ -48,22 +33,37 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE" + url = "https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE" } } } - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}-mpp/;publish=1;override=1") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + 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/krontab") + credentials { + 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') + } } } } - } -} \ No newline at end of file +} + +signing { + useGpgCmd() + sign publishing.publications +} From d52435a014f5ba8b22cc11448e2641ccd89a09ee Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 20:31:50 +0600 Subject: [PATCH 5/9] include publishing to packages --- .github/workflows/publishing_packages.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/publishing_packages.yml diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml new file mode 100644 index 0000000..30067e9 --- /dev/null +++ b/.github/workflows/publishing_packages.yml @@ -0,0 +1,22 @@ + +name: Publish package to GitHub Packages +on: [push] +jobs: + publishing: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Update version + run: | + branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" + sed -i -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" gradle.properties + - name: prebuild + run: ./gradlew clean build + - name: Publish package + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository + env: + GITHUBPACKAGES_USER: ${{ github.actor }} + GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From a15b4162fbec62333dc02aedebe3d4f67e550017 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 21:17:42 +0600 Subject: [PATCH 6/9] Update publishing_packages.yml --- .github/workflows/publishing_packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 30067e9..44205a4 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -16,7 +16,7 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication env: GITHUBPACKAGES_USER: ${{ github.actor }} - GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} From 0d1e3821827c1aea1be606b9bb2f6ae0677f38bc Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 21:34:56 +0600 Subject: [PATCH 7/9] Update publishing_packages.yml --- .github/workflows/publishing_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 44205a4..de37772 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -16,7 +16,7 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication -x signAndroidPublication env: GITHUBPACKAGES_USER: ${{ github.actor }} GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} From 40adf80d6ffac50c7ca3a962aa8577cdd28f1178 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 21:49:08 +0600 Subject: [PATCH 8/9] Update publishing_packages.yml --- .github/workflows/publishing_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index de37772..312186e 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -16,7 +16,7 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication -x signAndroidPublication + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication env: GITHUBPACKAGES_USER: ${{ github.actor }} GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} From 3a0870144b7f640524c812319014021ebde88e5c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Mar 2021 22:03:38 +0600 Subject: [PATCH 9/9] Update publishing_packages.yml --- .github/workflows/publishing_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 312186e..9af32ba 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -16,7 +16,7 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication -x signAndroidReleasePublication env: GITHUBPACKAGES_USER: ${{ github.actor }} GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}