Skip to content

Commit 0d48be5

Browse files
authored
Merge pull request #266 from naz013/release/9.5.0
REM-903 - Release 9.5.0
2 parents d088d09 + 31088bb commit 0d48be5

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.github/workflows/build_and_publish_release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
version_name=${GITHUB_REF#refs/heads/release/}
2727
2828
# Get existing version code from build.gradle
29-
version_code=$(grep "versionCode" app/build.gradle | awk '{print $2}' | tr -d '\n')
29+
version_code=$(grep -o -E 'versionCode = [[:digit:]\.]+' app/build.gradle.kts | grep -o -E '[[:digit:]\.]+')
3030
3131
# Increment existing version code by 1
3232
version_code=$((version_code + 1))
@@ -36,11 +36,11 @@ jobs:
3636
echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
3737
3838
- name: Increase version code and change version name
39-
run: |
40-
# Update build.gradle with new version code and name
41-
echo "${{ env.VERSION_CODE }} - ${{ env.VERSION_NAME }}"
42-
sed -i "s/versionCode [0-9]\+/versionCode ${{ env.VERSION_CODE }}/g" app/build.gradle
43-
sed -i "s/versionName \"[^\"]*\"/versionName \"${{ env.VERSION_NAME }}\"/g" app/build.gradle
39+
uses: chkfung/android-version-actions@v1.2.2
40+
with:
41+
gradlePath: app/build.gradle.kts
42+
versionCode: ${{ env.VERSION_CODE }}
43+
versionName: ${{ env.VERSION_NAME }}
4444

4545
- name: Commit and push changes
4646
run: |
@@ -111,4 +111,3 @@ jobs:
111111
packageName: com.cray.software.justreminderpro
112112
releaseFiles: ${{ steps.sign-pro.outputs.signedReleaseFile }}
113113
track: alpha
114-
changesNotSentForReview: true

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId = "com.cray.software.justreminder"
2323
minSdk = libs.versions.minSdk.get().toInt()
2424
targetSdk = libs.versions.targetSdk.get().toInt()
25-
versionCode = 321
26-
versionName = "9.4.1"
25+
versionCode = 324
26+
versionName = "9.5.0"
2727
multiDexEnabled = true
2828
renderscriptTargetApi = 23
2929
renderscriptSupportModeEnabled = true

app/src/main/res/values/whats_new_strings.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<string name="whats_new_version_and_date" translatable="false">%s, %s</string>
44
<string name="whats_new_text" translatable="false">
55
\n
6-
✅ Add Android 15 support;\n
7-
✅ Add option to attach the Note to the Reminder;\n
8-
⭐ Update translations;\n
6+
⭐ Remove Voice control;\n
7+
🐞 Fix the search on the Home screen;\n
98
🐞 Bug fixes and improvements.
109
</string>
1110
<string name="whats_new_emoji_set" translatable="false">

appwidgets/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,12 @@ dependencies {
7878

7979
implementation(libs.glance.appwidget)
8080
implementation(libs.glance.material3)
81+
implementation(libs.glance.preview)
82+
implementation(libs.glance.appwidget.preview)
8183

8284
implementation(platform(libs.compose.bom))
8385
implementation(libs.compose.material3)
86+
implementation(libs.compose.ui.tooling.preview)
8487

8588
debugImplementation(libs.glance.preview)
8689
debugImplementation(libs.glance.appwidget.preview)

0 commit comments

Comments
 (0)