Merge pull request #13 from InsanusMokrassar/0.5.1

0.5.1

.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 -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication -x signAndroidDebugPublication -x signAndroidReleasePublication
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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**

gradle.properties

@@ -8,12 +8,12 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.4.21
+kotlin_version=1.4.31
-kotlin_coroutines_version=1.4.2
+kotlin_coroutines_version=1.4.3
 
 dokka_version=1.4.20
 
-klockVersion=2.0.3
+klockVersion=2.0.7
 
 ## Github reease
 
@@ -29,10 +29,10 @@ 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
 
-version=0.5.0
+version=0.5.1
-android_code_version=1
+android_code_version=2
 

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

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"}]}}
+{"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/"}]}}

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"
+                developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/krontab.git[push=]https://github.com/InsanusMokrassar/krontab.git"
-                url = "https://git.insanusmokrassar.com:8322/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 {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
                 maven {
-                name = "bintray"
+                    name = "GithubPackages"
-                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")
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/krontab")
                     credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        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')
+                    }
                 }
             }
         }
-        
     }
 }
+
+signing {
+    useGpgCmd()
+    sign publishing.publications
+}