Skip to content

Commit 78771ec

Browse files
committed
Merge branch 'develop'
2 parents 7fb4b16 + 6c72f70 commit 78771ec

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [0.10.3] - 2024-08-19
4+
5+
### Changed
6+
- Reverted the version of Kotlin used to build the library back to 1.8.21
7+
38
## [0.10.2] - 2024-08-15
49

510
### Changed

RELEASE_GUIDE.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,14 @@ git push
9393
- NOTE: Depending in the time of day this can take some time (wait up to 1h and then complain under the original JIRA issue)
9494

9595
8. Create a new release tag in GitHub as follows:
96-
- Open up the GitHub release page at https://github.com/MobiSolutions/scrolls-android/releases, create a new release `vX.Y.Z`. Don't write an additional changelog there, just link to the changelog document.
96+
- Open up the GitHub release page at https://github.com/LabMobi/LabEncryptedStorage/releases, create a new release `X.Y.Z`. Don't write an additional changelog there, just link to the changelog document.
97+
- Also create a tag "release-X.Y.Z"
9798

9899
9) OPTIONAL: Update the library in at least one of the projects using it to make sure everything is in order.
99100

100101
## Post-release actions
101102

102-
1. Create and push a release tag to the repository
103-
104-
```bash
105-
git checkout main
106-
git pull
107-
git tag release-X.Y.Z # <- Substitute the current version here
108-
git push origin release-X.Y.Z # <- Substitute the current version here
109-
```
110-
111-
112-
113-
2. In the `develop` branch update the library version code to a new version so the `develop` branch code and the released code does not have a matching version.
103+
1. In the `develop` branch update the library version code to a new version so the `develop` branch code and the released code does not have a matching version.
114104

115105
```
116106
git checkout develop

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ext {
1111
// Version name will be versionMajor.versionMinor.versionPatch
1212
versionMajor = 0
1313
versionMinor = 10
14-
versionPatch = 2
14+
versionPatch = 3
1515
}
1616

1717
buildscript {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android-sdk-min = '21'
44
android-sdk-target = '34'
55
android-sdk-compile = 'android-34'
66

7-
kotlin = '2.0.0'
7+
kotlin = '1.8.21'
88

99
[libraries]
1010

0 commit comments

Comments
 (0)