Fix prepare release script

Author: brizental

.circleci/config.yml

@@ -132,7 +132,7 @@ jobs:
             source venv/bin/activate
             pip install -r requirements.txt
             glean_parser translate metrics.yaml pings.yaml -f javascript -o generated \
-            --option platform=qt --option version="0.15";
+            --option platform=qt --option version="0.16"
 
             sudo apt-get install xvfb
             xvfb-run python main.py &> qml.log &

bin/prepare-release.sh

@@ -122,8 +122,14 @@ GLEAN_VERSION_FOR_QML=$(node -p -e "'${NEW_VERSION}'.split('.').reverse().slice(
 
 FILE=samples/qt-qml-app/main.qml
 run $SED -i.bak -E \
-    -e "s/import org.mozilla.Glean [0-9a-z.-]+/import org.mozilla.Glean ${GLEAN_VERSION_FOR_QML};/" \
-    -e "s/import generated [0-9a-z.-]+/import generated ${GLEAN_VERSION_FOR_QML};/" \
+    -e "s/import org.mozilla.Glean [0-9a-z.-]+;/import org.mozilla.Glean ${GLEAN_VERSION_FOR_QML};/" \
+    -e "s/import generated [0-9a-z.-]+;/import generated ${GLEAN_VERSION_FOR_QML};/" \
+    "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
+FILE=.circleci/config.yml
+run $SED -i.bak -E \
+    -e "s/--option platform=qt --option version=\"[0-9a-z.-]+\"/--option platform=qt --option version=\"${GLEAN_VERSION_FOR_QML}\"/" \
     "${WORKSPACE_ROOT}/${FILE}"
 run rm "${WORKSPACE_ROOT}/${FILE}.bak"
 

samples/qt-qml-app/main.qml

@@ -6,8 +6,8 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtGraphicalEffects 1.15
 
-import org.mozilla.Glean 0.16;;
-import generated 0.16;;
+import org.mozilla.Glean 0.16;
+import generated 0.16;
 
 Rectangle {
   id: screen