From 397fa182ce2075fc02c6253668cd413ecb68c418 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 17 Mar 2022 11:43:20 +0100
Subject: [PATCH] v4.12.0

---
 CHANGELOG.md             | 31 +++++++++++++++++++++++++++++++
 android/app/build.gradle |  4 ++--
 android/build.gradle     |  2 +-
 manifest.json            |  2 +-
 package-lock.json        |  4 ++--
 package.json             |  2 +-
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed1516cea3..0f3dbac543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## v4.12.0
+
+### New
+- [Native] Schedule sync automatically after local edits
+- [native] Implement Update screen
+- Implement support for separators
+- More beautiful status indicators
+- Sync chrome:// URLs (but not on Firefox and not with Nextcloud bookmarks)
+- Implement timed locks for GoogleDrive and WebDAV to reduce waiting time
+- Reduce inactivity timeout to 20s
+
+### Fixed
+- [Native] Fix broken favicons
+- [Native] speed-up tree navigation
+- [native] Performance improvements
+- [native] UX: Allow pressing BACK when adding/editing items
+- UX: Improve progress bar feedback during syncing
+- UX: Improve wording around sync strategies
+- Performance: Avoid loading all of lodash
+- Google Drive: Force upload when new account or new encryption
+- Do not delete duplicate bookmarks anymore
+- Tab sync: Do not remove duplicated tabs on sync and sync tab order
+- Fix Unidirectional sync
+- Unidirectional: Fix ordering
+- LocalTabs: Implement set order
+- Improve order reconciliation
+- Keep local sort order of ignored items
+- GoogleDrive: Fix locking
+- WebDAV: Don't lock if using slave strategy
+
+
 ## v4.11.0
 
 ### New
diff --git a/android/app/build.gradle b/android/app/build.gradle
index b6a5298ea6..bccf8da5a3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4011000
-        versionName "4.11.0"
+        versionCode 4012000
+        versionName "4.12.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/android/build.gradle b/android/build.gradle
index fb8c5265ed..21422641ed 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.1'
     }
 }
 
diff --git a/manifest.json b/manifest.json
index 81eafc7f1f..f89c104462 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "4.11.0.1",
+  "version": "4.12.0",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/package-lock.json b/package-lock.json
index 447520b7d4..b803d4932c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "floccus",
-  "version": "4.11.0",
+  "version": "4.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "floccus",
-      "version": "4.11.0",
+      "version": "4.12.0",
       "license": "MPL-2.0",
       "dependencies": {
         "@byteowls/capacitor-oauth2": "^3.0.1",
diff --git a/package.json b/package.json
index 6d891d7cea..811179f15f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "4.11.0",
+  "version": "4.12.0",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",