From 932f47a8ae3b2fd5714a58ed26c9fd81152b0bb2 Mon Sep 17 00:00:00 2001
From: sammy-da <sammy.abed@digitalasset.com>
Date: Mon, 16 Aug 2021 12:46:39 -0400
Subject: [PATCH 1/2] change bots package version naming

---
 Makefile                 | 13 +++++++------
 python/operator/setup.py |  2 +-
 python/user/setup.py     |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 51206d7..beeb692 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 DIT_NAME=$(shell ddit targetname)
 BASENAME=$(shell ddit targetname --basename)
 VERSION=$(shell ddit ditversion)
+BOT_VERSION=$(shell ddit  ditversion | sed "s/-rc./rc/")
 
 NAME=${BASENAME}-${VERSION}
 
@@ -8,8 +9,8 @@ PKG_FILES=$(shell find pkg -type f)
 
 PYTHON := pipenv run python
 
-operator_bot := target/daml-chat-operator-bot-$(VERSION).tar.gz
-user_bot := target/daml-chat-user-bot-$(VERSION).tar.gz
+operator_bot := target/daml-chat-operator-bot-$(BOT_VERSION).tar.gz
+user_bot := target/daml-chat-user-bot-$(BOT_VERSION).tar.gz
 ui := target/daml-chat-ui-$(VERSION).zip
 
 .PHONY: all package publish
@@ -29,17 +30,17 @@ target:
 	mkdir $@
 
 $(operator_bot):
-	cd python/operator && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist
+	cd python/operator && DDIT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
 	rm -fr python/operator/daml_chat_operator_bot.egg-info
 	mkdir -p $(@D)
-	mv python/operator/dist/daml-chat-operator-bot-$(VERSION).tar.gz $@
+	mv python/operator/dist/daml-chat-operator-bot-$(BOT_VERSION).tar.gz $@
 	rm -r python/operator/dist
 
 $(user_bot):
-	cd python/user && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist
+	cd python/user && BOT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
 	rm -fr python/user/daml_chat_user_bot.egg-info
 	mkdir -p $(@D)
-	mv python/user/dist/daml-chat-user-bot-$(VERSION).tar.gz $@
+	mv python/user/dist/daml-chat-user-bot-$(BOT_VERSION).tar.gz $@
 	rm -r python/user/dist
 
 $(ui): $(user_bot)
diff --git a/python/operator/setup.py b/python/operator/setup.py
index bf622dc..62c81d2 100644
--- a/python/operator/setup.py
+++ b/python/operator/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup(name='daml-chat-operator-bot',
-      version=os.environ.get('DDIT_VERSION', 'release'),
+      version=os.environ.get('BOT_VERSION', 'release'),
       description='Daml Chat Operator',
       author='Digital Asset',
       license='Apache2',
diff --git a/python/user/setup.py b/python/user/setup.py
index e6d8c0f..353d84d 100644
--- a/python/user/setup.py
+++ b/python/user/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup(name='daml-chat-user-bot',
-      version=os.environ.get('DDIT_VERSION', 'release'),
+      version=os.environ.get('BOT_VERSION', 'release'),
       description='Daml Chat User',
       author='Digital Asset',
       license='Apache2',

From abe6f560ce0be70b09e3123303bea4e6191c779a Mon Sep 17 00:00:00 2001
From: sammy-da <sammy.abed@digitalasset.com>
Date: Mon, 16 Aug 2021 12:46:57 -0400
Subject: [PATCH 2/2] version bump

---
 Makefile       | 4 ++--
 dabl-meta.yaml | 4 ++--
 package.json   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index beeb692..9953428 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 DIT_NAME=$(shell ddit targetname)
 BASENAME=$(shell ddit targetname --basename)
 VERSION=$(shell ddit ditversion)
-BOT_VERSION=$(shell ddit  ditversion | sed "s/-rc./rc/")
+BOT_VERSION=$(shell ddit ditversion | sed "s/-rc./rc/")
 
 NAME=${BASENAME}-${VERSION}
 
@@ -30,7 +30,7 @@ target:
 	mkdir $@
 
 $(operator_bot):
-	cd python/operator && DDIT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
+	cd python/operator && BOT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
 	rm -fr python/operator/daml_chat_operator_bot.egg-info
 	mkdir -p $(@D)
 	mv python/operator/dist/daml-chat-operator-bot-$(BOT_VERSION).tar.gz $@
diff --git a/dabl-meta.yaml b/dabl-meta.yaml
index 3eba670..7d026c5 100644
--- a/dabl-meta.yaml
+++ b/dabl-meta.yaml
@@ -1,10 +1,10 @@
 catalog:
   name: daml-chat
-  version: 0.2.3
+  version: 2.0.0-rc.1
   short_description: Daml Chat
   description: A straightforward web chat app.
   author: Digital Asset (Switzerland) GmbH
   source_url: https://github.com/digital-asset/dablchat
   license: Apache-2.0
-  tags: [dabl-sample-app, application]
+  tags: [dabl-sample-app, application, experimental]
   icon_file: dabl-chat.png
diff --git a/package.json b/package.json
index 06920fd..a2bf72c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "daml-chat",
-  "version": "1.8.5",
+  "version": "2.0.0-rc.1",
   "private": true,
   "dependencies": {
     "@webscopeio/react-textarea-autocomplete": "^4.6.1",