Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@ Releasing

1. Create a new branch called `release/X.Y.Z`
2. `git checkout -b release/X.Y.Z`
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)
3. Change the version in `gradle.properties` to your desired release version (see `Update Version`)
4. `git commit -am "Create 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. `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.
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 `master`
10. The CI pipeline will recognize the tag and upload, close and promote the artifacts automatically, and generate changelog automatically

Example (stable release)
========
1. Current version is 1.3.0
1. Current VERSION_NAME in `gradle.properties` = 1.3.0
2. `git checkout -b 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`. 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
3. Change VERSION_NAME = 1.3.1 (next higher version)
4. Update CHANGELOG.md
5. `git commit -am "Create release 1.3.1`
6. `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 master will create a snapshot release 1.3.2-SNAPSHOT and tag push will create stable release 1.3.1
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class AndroidLifecyclePluginTests {
// Simulate activity startup
lifecyclePlugin.onActivityCreated(mockActivity, mockBundle)

verify (timeout = 2000){ mockPlugin.updateState(true) }
verify (timeout = 4000){ mockPlugin.updateState(true) }
val track = slot<TrackEvent>()
verify { mockPlugin.track(capture(track)) }
with(track.captured) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.segment.analytics.kotlin.core

object Constants {
const val LIBRARY_VERSION = "1.4.2"
const val LIBRARY_VERSION = "1.4.3"
const val DEFAULT_API_HOST = "api.segment.io/v1"
const val DEFAULT_CDN_HOST = "cdn-settings.segment.com/v1"
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ kotlin.code.style=official
# Deployment variables
GROUP=com.segment.analytics.kotlin

VERSION_CODE=142
VERSION_NAME=1.4.2
VERSION_CODE=143
VERSION_NAME=1.4.3

POM_NAME=Segment for Kotlin
POM_DESCRIPTION=The hassle-free way to add analytics to your Kotlin app.
Expand Down