Skip to content

Commit 2895e29

Browse files
authored
prepare release 1.4.2 (#69)
* prepare snapshot 1.4.3 * update RELEASING.md * try to resolve flaky test
1 parent 43c1a6c commit 2895e29

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

RELEASING.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,25 @@ Releasing
99

1010
1. Create a new branch called `release/X.Y.Z`
1111
2. `git checkout -b release/X.Y.Z`
12-
3. Change the version to your desired release version (see `Update Version`)
13-
4. `git commit -am "Prepare release X.Y.Z."` (where X.Y.Z is the new version)
12+
3. Change the version in `gradle.properties` to your desired release version (see `Update Version`)
13+
4. `git commit -am "Create release X.Y.Z."` (where X.Y.Z is the new version)
1414
5. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version)
15-
6. `git push && git push --tags`
16-
7. The CI pipeline will recognize the tag and upload, close and promote the artifacts, and generate changelog automatically
17-
8. Create a PR to merge the new branch into `main`
18-
9. The CI pipeline will trigger a snapshot workflow and upload the artifact.
15+
6. Upgrade to next version by changing version in `gradle.properties`
16+
7. `git commit -am "Prepare snapshot X.Y.Z-SNAPSHOT"`
17+
8. `git push && git push --tags`
18+
9. Create a PR to merge the new branch into `master`
19+
10. The CI pipeline will recognize the tag and upload, close and promote the artifacts automatically, and generate changelog automatically
1920

2021
Example (stable release)
2122
========
22-
1. Current version is 1.3.0
23+
1. Current VERSION_NAME in `gradle.properties` = 1.3.0
2324
2. `git checkout -b release/1.3.1`
24-
3. Change version to 1.3.1 (next higher version, see `Update Version`)
25-
4. `git commit -am "Prepare release 1.3.1"`
26-
5. `git tag -a 1.3.1 -m "Version 1.3.1"`
27-
6. `git push && git push --tags`. This tag push will create stable release 1.3.1 with auto-generated changelog
28-
8. Create a PR to merge the new branch into `main`. Merging PR main will create a snapshot release 1.3.1-SNAPSHOT
25+
3. Change VERSION_NAME = 1.3.1 (next higher version)
26+
4. Update CHANGELOG.md
27+
5. `git commit -am "Create release 1.3.1`
28+
6. `git tag -a 1.3.1 -m "Version 1.3.1"`
29+
6. `git push && git push --tags`
30+
7. Change VERSION_NAME = 1.3.2 (next higher version)
31+
8. `git commit -am "Prepare snapshot 1.3.2-SNAPSHOT"`
32+
9. `git push && git push --tags`
33+
10. Merging PR master will create a snapshot release 1.3.2-SNAPSHOT and tag push will create stable release 1.3.1

android/src/test/java/com/segment/analytics/kotlin/android/AndroidLifecyclePluginTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class AndroidLifecyclePluginTests {
193193
// Simulate activity startup
194194
lifecyclePlugin.onActivityCreated(mockActivity, mockBundle)
195195

196-
verify (timeout = 2000){ mockPlugin.updateState(true) }
196+
verify (timeout = 4000){ mockPlugin.updateState(true) }
197197
val track = slot<TrackEvent>()
198198
verify { mockPlugin.track(capture(track)) }
199199
with(track.captured) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.segment.analytics.kotlin.core
22

33
object Constants {
4-
const val LIBRARY_VERSION = "1.4.2"
4+
const val LIBRARY_VERSION = "1.4.3"
55
const val DEFAULT_API_HOST = "api.segment.io/v1"
66
const val DEFAULT_CDN_HOST = "cdn-settings.segment.com/v1"
77
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ kotlin.code.style=official
2323
# Deployment variables
2424
GROUP=com.segment.analytics.kotlin
2525

26-
VERSION_CODE=142
27-
VERSION_NAME=1.4.2
26+
VERSION_CODE=143
27+
VERSION_NAME=1.4.3
2828

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

0 commit comments

Comments
 (0)