prepare release 1.4.1 (#64)

* prepare release 1.4.0

* fix pom dependencies issue

* remove v prefix in tag

* update version in constants

* update readme and releasing

* update version to 1.4.1

* fix artifact not found

* fix release workflow job name

* update version code

* update RELEASING.md

Author: wenxi-zeng

.github/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - '*.*.*'
 
 jobs:
-  snapshot:
+  release:
     runs-on: ubuntu-latest
     environment: deployment
     steps:
@@ -17,7 +17,7 @@ jobs:
       - name: Verify tag
         run: |
           VERSION=$(grep VERSION_NAME gradle.properties | awk -F= '{ print $2 }' | sed "s/-SNAPSHOT//")
-          if [ "${{ steps.vars.outputs.tag }}" != "v$VERSION" ]; then {
+          if [ "${{ steps.vars.outputs.tag }}" != "$VERSION" ]; then {
             echo "Tag ${{ steps.vars.outputs.tag }} does not match the package version ($VERSION)"
             exit 1
           } fi

README.md

@@ -1,5 +1,5 @@
 # Analytics-Kotlin
-[![](https://jitpack.io/v/segmentio/analytics-kotlin.svg)](https://jitpack.io/#segmentio/analytics-kotlin)
+[![maven](https://img.shields.io/maven-central/v/com.segment.analytics.kotlin/android)](https://repo1.maven.org/maven2/com/segment/analytics/kotlin/)
 [![](https://github.com/segmentio/analytics-kotlin/actions/workflows/build.yml/badge.svg)](https://github.com/segmentio/analytics-kotlin/actions)
 [![codecov](https://codecov.io/gh/segmentio/analytics-kotlin/branch/main/graph/badge.svg?token=U5FDRBZOXO)](https://codecov.io/gh/segmentio/analytics-kotlin)
 [![Known Vulnerabilities](https://snyk.io/test/github/segmentio/analytics-kotlin/badge.svg)](https://snyk.io/test/github/segmentio/analytics-kotlin)

RELEASING.md

@@ -1,26 +1,28 @@
+Update Version
+=========
+1. Update VERSION_CODE in `gradle.properties`
+2. Update VERSION_NAME in `gradle.properties`
+3. Update LIBRARY_VERSION in `core/Constants.kt`
+
 Releasing
 =========
 
 1. Create a new branch called `release/X.Y.Z`
 2. `git checkout -b release/X.Y.Z`
-3. Change the version in `gradle.properties` to your desired release version
-4. `git commit -am "Create release X.Y.Z."` (where X.Y.Z is the new version)
+3. Change the version to your desired release version (see `Update Version`)
+4. `git commit -am "Prepare release X.Y.Z."` (where X.Y.Z is the new version)
 5. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version)
-6. Upgrade to next version by changing version in `gradle.properties`
-7. `git commit -am "Prepare snapshot X.Y.Z-SNAPSHOT"`
-8. `git push && git push --tags`
-9. Create a PR to merge the new branch into `main`
-10. The CI pipeline will recognize the tag and upload, close and promote the artifacts, and generate changelog automatically
+6. `git push && git push --tags`
+7. The CI pipeline will recognize the tag and upload, close and promote the artifacts, and generate changelog automatically
+8. Create a PR to merge the new branch into `main`
+9. The CI pipeline will trigger a snapshot workflow and upload the artifact.
 
 Example (stable release)
 ========
-1. Current VERSION_NAME in `gradle.properties` = 1.3.0
+1. Current version is 1.3.0
 2. `git checkout -b release/1.3.1`
-3. Change VERSION_NAME = 1.3.1 (next higher version)
-4. `git commit -am "Create release 1.3.1"`
+3. Change version to 1.3.1 (next higher version, see `Update Version`)
+4. `git commit -am "Prepare release 1.3.1"`
 5. `git tag -a 1.3.1 -m "Version 1.3.1"`
-6. `git push && git push --tags`
-7. Change VERSION_NAME = 1.3.2 (next higher version)
-8. `git commit -am "Prepare snapshot 1.3.2-SNAPSHOT"`
-9. `git push && git push --tags`
-10. Merging PR main will create a snapshot release 1.3.2-SNAPSHOT and tag push will create stable release 1.3.1 with auto-generated changelog
+6. `git push && git push --tags`. This tag push will create stable release 1.3.1 with auto-generated changelog
+8. Create a PR to merge the new branch into `main`. Merging PR main will create a snapshot release 1.3.1-SNAPSHOT

build.gradle

@@ -31,6 +31,9 @@ allprojects {
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
+
+    group GROUP
+    version VERSION_NAME
 }
 
 snyk {

core/src/main/java/com/segment/analytics/kotlin/core/Constants.kt

@@ -1,7 +1,7 @@
 package com.segment.analytics.kotlin.core
 
 object Constants {
-    const val LIBRARY_VERSION = "1.3.0"
+    const val LIBRARY_VERSION = "1.4.1"
     const val DEFAULT_API_HOST = "api.segment.io/v1"
     const val DEFAULT_CDN_HOST = "cdn-settings.segment.com/v1"
 }

gradle.properties

@@ -23,8 +23,8 @@ kotlin.code.style=official
 # Deployment variables
 GROUP=com.segment.analytics.kotlin
 
-VERSION_CODE=130
-VERSION_NAME=1.3.0
+VERSION_CODE=141
+VERSION_NAME=1.4.1
 
 POM_NAME=Segment for Kotlin
 POM_DESCRIPTION=The hassle-free way to add analytics to your Kotlin app.

gradle/mvn-publish.gradle

@@ -14,7 +14,7 @@ publishing {
                 artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
             }
             else {
-                artifact("$buildDir/libs/${project.getName()}.jar")
+                artifact("$buildDir/libs/${project.getName()}-${VERSION_NAME}.jar")
             }
             artifact sourcesJar
             artifact javadocJar
@@ -50,13 +50,24 @@ publishing {
                 // that the library builds upon
                 withXml {
                     def dependenciesNode = asNode().appendNode('dependencies')
+                    ext.addDependency = { Dependency dep, String scope ->
+                        if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+                            return // invalid dependencies should be ignored
 
-                    project.configurations.implementation.allDependencies.each {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
+                        final dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('artifactId', dep.name)
+                        if (dep.version == 'unspecified') {
+                            dependencyNode.appendNode('groupId', project.ext.pomGroupID)
+                            dependencyNode.appendNode('version', project.ext.pomVersion)
+                        } else {
+                            dependencyNode.appendNode('groupId', dep.group)
+                            dependencyNode.appendNode('version', dep.version)
+                        }
+                        dependencyNode.appendNode('scope', scope)
                     }
+
+                    configurations.api.getDependencies().each { dep -> addDependency(dep, "compile") }
+                    configurations.implementation.getDependencies().each { dep -> addDependency(dep, "runtime") }
                 }
             }
         }