From 2c504185942f8f4c59aecd4f8b4a95764deb1571 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 30 Aug 2022 15:56:34 +0200 Subject: [PATCH 1/3] Updated Syncthing to v1.21.0-rc.2 --- 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 f5aa604e..b10d106a 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit f5aa604efc7567dc1603ece3d933aa77197ee3d3 +Subproject commit b10d106a55cb9e7e2da152206e4ac59fa3549c02 From fa4cb0d71125ccdc4d93b4d282ef5df57932195a Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 30 Aug 2022 21:09:48 +0200 Subject: [PATCH 2/3] Bumped version to 1.21.0-rc.2 --- app/build.gradle | 4 ++-- app/src/main/play/release-notes/en-GB/default.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ca0ad177..dbcb45a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 30 - versionCode 4317 - versionName "1.21.0-rc.1" + versionCode 4318 + versionName "1.21.0-rc.2" 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 ff1eef0b..608dde40 100644 --- a/app/src/main/play/release-notes/en-GB/default.txt +++ b/app/src/main/play/release-notes/en-GB/default.txt @@ -1,2 +1,2 @@ -* Update Syncthing to v1.21.0-rc.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0-rc.1 ) +* Update Syncthing to v1.21.0-rc.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0-rc.2 ) * Unreliable charging detection ( #1595 ) From 3dc29468bc9ef9ca6dfcbc651bf9c3be641cf409 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 6 Sep 2022 22:47:30 +0200 Subject: [PATCH 3/3] Bumped version to 1.21.0 --- app/build.gradle | 4 ++-- app/src/main/play/release-notes/en-GB/default.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dbcb45a5..f5797fab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 30 - versionCode 4318 - versionName "1.21.0-rc.2" + versionCode 4319 + versionName "1.21.0" 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 608dde40..14007ec3 100644 --- a/app/src/main/play/release-notes/en-GB/default.txt +++ b/app/src/main/play/release-notes/en-GB/default.txt @@ -1,2 +1,2 @@ -* Update Syncthing to v1.21.0-rc.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0-rc.2 ) +* Update Syncthing to v1.21.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0 ) * Unreliable charging detection ( #1595 )