From b55b4da9f527b9aecad45d236a75242909a2e4d0 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 17 Jul 2023 21:05:58 +0200 Subject: [PATCH 1/5] Downgrade Syncthing to v1.23.6 Need to release again --- syncthing/src/github.com/syncthing/syncthing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index 937895be..fdde05cf 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 937895be69fd79c17179afe22d681d27820c037d +Subproject commit fdde05cf1240ab2c8de86fc9a5073e1634b86835 From 80085a56865bb40e7d7e1cae270318e25afb65ee Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 17 Jul 2023 21:11:28 +0200 Subject: [PATCH 2/5] Bumped version to 1.23.6.1 --- app/build.gradle | 4 ++-- app/src/main/play/release-notes/en-GB/default.txt | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c31f32a5..857bff22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 21 targetSdkVersion 32 - versionCode 4354 - versionName "1.23.7-rc.1" + versionCode 4355 + versionName "1.23.6.1" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/app/src/main/play/release-notes/en-GB/default.txt b/app/src/main/play/release-notes/en-GB/default.txt index 2e725e0c..a9767a77 100644 --- a/app/src/main/play/release-notes/en-GB/default.txt +++ b/app/src/main/play/release-notes/en-GB/default.txt @@ -1,5 +1,3 @@ -* Fix some UI issues after the migration to Material Design 3 (#1915, #1918) -* Fix crashes due to syncthing event parsing failure (#1884) -* Use GHA instead of TeamCity as CI -* Switch to publishing to goolge play with bundles -* Update Syncthing to v1.23.6 ( https://github.com/syncthing/syncthing/releases/tag/v1.23.6 ) +* Fix issue with google play bundle release/packaging ( #1943 ) + +No other changes compared to 1.23.6 From 38a969f60fed0da28ff389d6f758502ec2acce94 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 17 Jul 2023 21:15:15 +0200 Subject: [PATCH 3/5] Add release tag pattern for hotfix releases The joys. --- .github/workflows/release-app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-app.yaml b/.github/workflows/release-app.yaml index f55863fb..871d1b17 100644 --- a/.github/workflows/release-app.yaml +++ b/.github/workflows/release-app.yaml @@ -5,6 +5,7 @@ on: # Cannot filter on both branches (release) and tags - it's ORed tags: - '[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+.[0-9]+' - '[0-9]+.[0-9]+.[0-9]+-rc\.[0-9]+' - '[0-9]+.[0-9]+.[0-9]+-rc\.[0-9]+\.[0-9]+' From a3ded6792f895691ec651224b1958088e60a7be4 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 17 Jul 2023 21:16:36 +0200 Subject: [PATCH 4/5] Bumped version to 1.23.6.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 857bff22..023cd6d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 21 targetSdkVersion 32 - versionCode 4355 - versionName "1.23.6.1" + versionCode 4356 + versionName "1.23.6.2" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } From d565cf059ba771b656eef102b2820af159ec2a95 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 17 Jul 2023 21:19:13 +0200 Subject: [PATCH 5/5] Bumped version to 1.23.6.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 023cd6d4..820006f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 21 targetSdkVersion 32 - versionCode 4356 - versionName "1.23.6.2" + versionCode 4357 + versionName "1.23.6.3" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' }