From 4501f517cd83e0b5f6a1719ce5147ebe66e66ef2 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Tue, 8 Mar 2022 18:12:23 +0100
Subject: [PATCH] Bump version for 1.54.0

---
 CHANGELOG             | 6 ++++++
 CloudronManifest.json | 5 +++--
 DESCRIPTION.md        | 2 --
 Dockerfile            | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3b00cea..0ac716c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -574,3 +574,9 @@
 * Support the dir parameter on the /relations endpoint, per MSC3715. (#11941)
 * Experimental implementation of MSC3706: extensions to /send_join to support reduced response size. (#11967)
 
+[1.39.0]
+* Update Synapse to 1.54.0
+* [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.54.0)
+* Fix a bug introduced in Synapse 1.54.0rc1 preventing the new module callbacks introduced in this release from being registered by modules. (#12141)
+* Fix a bug introduced in Synapse 1.54.0rc1 where runtime dependency version checks would mistakenly check development dependencies if they were present and would not accept pre-release versions of dependencies. (#12129, #12177)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 8976ffb..d31fef6 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Secure & decentralized communication",
-  "version": "1.38.6",
+  "version": "1.39.0",
+  "upstreamVersion": "1.54.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
@@ -30,7 +31,7 @@
   ],
   "changelog": "file://CHANGELOG",
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "5.3.0",
+  "minBoxVersion": "7.1.2",
   "forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
   "documentationUrl": "https://docs.cloudron.io/apps/synapse/",
   "optionalSso": true
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 579efec..259f987 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,5 +1,3 @@
-This app packages Synapse <upstream>1.53.0</upstream>.
-
 **This package only provides the Matrix backend. A variety of clients are available
 [here](https://matrix.org/clients/). Riot is a popular web frontend for Matrix and
 is available as a separate app.**
diff --git a/Dockerfile b/Dockerfile
index 954736d..ed6f686 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN virtualenv -p python3 /app/code/env
 ENV VIRTUAL_ENV=/app/code/env
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-ARG VERSION=v1.53.0
+ARG VERSION=v1.54.0
 
 # Synapse (https://github.com/matrix-org/synapse/blob/master/INSTALL.md)
 # lxml - required for previews