Promote to version 3.4

.github_changelog_generator

@@ -1,5 +1,5 @@
 unreleased=true
-future-release=3.3.5
+future-release=3.4.0
 since-tag=2.2.5
 exclude-tags=Continuous
 exclude_labels=duplicate,question,invalid,wontfix,rejected,infrastructure,technical task,news,not our bug,discussion,website,support request,driver issue

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## [3.4.0](https://github.com/ColinDuquesnoy/MellowPlayer/tree/3.4.0) (2018-07-08)
+[Full Changelog](https://github.com/ColinDuquesnoy/MellowPlayer/compare/3.3.5...3.4.0)
+
+**Implemented enhancements:**
+
+- Add brazilian translations [\#256](https://github.com/ColinDuquesnoy/MellowPlayer/issues/256)
+- Settings page for each plugin. [\#236](https://github.com/ColinDuquesnoy/MellowPlayer/issues/236)
+- Youtube: automatically mute and skip ads [\#218](https://github.com/ColinDuquesnoy/MellowPlayer/issues/218)
+- Stop automatically playing videos in MellowPlayer [\#130](https://github.com/ColinDuquesnoy/MellowPlayer/issues/130)
+- Youtube plugin improvements [\#229](https://github.com/ColinDuquesnoy/MellowPlayer/pull/229) ([NicolasGuilloux](https://github.com/NicolasGuilloux))
+- Add Yandex Music support [\#223](https://github.com/ColinDuquesnoy/MellowPlayer/pull/223) ([rustamzh](https://github.com/rustamzh))
+- Google Play Music: handle cases when we can't go to next/previous [\#222](https://github.com/ColinDuquesnoy/MellowPlayer/pull/222) ([DmMlhch](https://github.com/DmMlhch))
+- Google Play Music: add favorites support [\#220](https://github.com/ColinDuquesnoy/MellowPlayer/pull/220) ([DmMlhch](https://github.com/DmMlhch))
+
+**Fixed bugs:**
+
+- MPRIS2 Pause should only pause, not be a toggle and play if already paused [\#250](https://github.com/ColinDuquesnoy/MellowPlayer/issues/250)
+- Unable to add user scripts on Windows 10 [\#249](https://github.com/ColinDuquesnoy/MellowPlayer/issues/249)
+- Fix Qt 5.11 qml warnings [\#244](https://github.com/ColinDuquesnoy/MellowPlayer/issues/244)
+- Listening history broken with Qt 5.11 [\#243](https://github.com/ColinDuquesnoy/MellowPlayer/issues/243)
+- Mixcloud mixtape art sometimes missing or blurry in KDE Mpris Client [\#240](https://github.com/ColinDuquesnoy/MellowPlayer/issues/240)
+- Open Dev Tools from right-click menu does not work. [\#239](https://github.com/ColinDuquesnoy/MellowPlayer/issues/239)
+- Quit action from KDE's MPRIS player tray icon does not work [\#226](https://github.com/ColinDuquesnoy/MellowPlayer/issues/226)
+- Web view scrollbar does not always work and is hard to use [\#225](https://github.com/ColinDuquesnoy/MellowPlayer/issues/225)
+- Unable to maximize window on 1280x720 screens [\#221](https://github.com/ColinDuquesnoy/MellowPlayer/issues/221)
+- Fix Spotify integration script [\#258](https://github.com/ColinDuquesnoy/MellowPlayer/pull/258) ([b0o](https://github.com/b0o))
+- Youtube plugin improvements [\#229](https://github.com/ColinDuquesnoy/MellowPlayer/pull/229) ([NicolasGuilloux](https://github.com/NicolasGuilloux))
+- Youtube: fix the art URL and the position [\#227](https://github.com/ColinDuquesnoy/MellowPlayer/pull/227) ([NicolasGuilloux](https://github.com/NicolasGuilloux))
+
+**Closed issues:**
+
+- Debian package for Ubuntu 18.04 [\#238](https://github.com/ColinDuquesnoy/MellowPlayer/issues/238)
+- Improve README instructions for installing with qbs [\#230](https://github.com/ColinDuquesnoy/MellowPlayer/issues/230)
+
+**Merged pull requests:**
+
+- Google Play Music : add seeking support [\#219](https://github.com/ColinDuquesnoy/MellowPlayer/pull/219) ([DmMlhch](https://github.com/DmMlhch))
+- Minor docs updates [\#215](https://github.com/ColinDuquesnoy/MellowPlayer/pull/215) ([axxx007xxxz](https://github.com/axxx007xxxz))
+
 ## [3.3.5](https://github.com/ColinDuquesnoy/MellowPlayer/tree/3.3.5) (2018-03-03)
 [Full Changelog](https://github.com/ColinDuquesnoy/MellowPlayer/compare/3.3.4...3.3.5)
 
@@ -15,7 +54,7 @@
 
 **Merged pull requests:**
 
-- add Hypemachine [\#208](https://github.com/ColinDuquesnoy/MellowPlayer/pull/208) ([bayang](https://github.com/bayang))
+- Add Hypemachine support [\#208](https://github.com/ColinDuquesnoy/MellowPlayer/pull/208) ([bayang](https://github.com/bayang))
 
 ## [3.3.4](https://github.com/ColinDuquesnoy/MellowPlayer/tree/3.3.4) (2018-02-18)
 [Full Changelog](https://github.com/ColinDuquesnoy/MellowPlayer/compare/3.3.3...3.3.4)

appveyor.yml

@@ -1,4 +1,4 @@
-version: "3.3.50.{build}"
+version: "3.4.0.{build}"
 os: Visual Studio 2017
 platform:
   - x64

mellowplayer.qbs

@@ -13,8 +13,8 @@ Project {
 
     // Version info
     property int versionMajor: 3
-    property int versionMinor: 3
-    property int versionPatch: 50
+    property int versionMinor: 4
+    property int versionPatch: 0
     property int buildNumber: {
         var ciBuildNumber = Environment.getEnv("TRAVIS_BUILD_NUMBER");
         if (!ciBuildNumber) {
@@ -51,4 +51,4 @@ Project {
         "tests/tests.qbs",
         "scripts/packaging/packaging.qbs"
     ]
-}
+}

scripts/promotion/promotions.py

@@ -71,32 +71,37 @@ def bump_version(self, *args):
 
     @staticmethod
     def read_cmake_version():
-        with open("CMakeLists.txt") as f:
+        with open("mellowplayer.qbs") as f:
             lines = f.read().splitlines()
+        version_major = 0
+        version_minor = 0
+        version_patch = 0
         for l in lines:
-            if l.startswith("project(MellowPlayer VERSION "):
-                m = re.match(r'project\(.*VERSION\s(.*)\.\$.*\)', l)
-                if m:
-                    version = m.groups()[0]
-                    version_numbers = []
-                    for n in version.split('.'):
-                        version_numbers.append(int(n))
-                    return Version(version_numbers[0], version_numbers[1], version_numbers[2])
+            if l.startswith("    property int versionMajor:"):
+                version_major = int(l.split(":")[1].strip())
+            elif l.startswith("    property int versionMinor:"):
+                version_minor = int(l.split(":")[1].strip())
+            elif l.startswith("    property int versionPatch:"):
+                version_patch = int(l.split(":")[1].strip())
 
-        return Version()
+        return Version(version_major, version_minor, version_patch)
 
     @staticmethod
     def write_cmake_version(version):
-        with open("CMakeLists.txt") as f:
+        with open("mellowplayer.qbs") as f:
             lines = f.read().splitlines()
         updated_lines = []
         for l in lines:
-            if l.startswith("project(MellowPlayer VERSION "):
-                updated_lines.append("project(MellowPlayer VERSION %s.${BUILD_NUMBER})" % version)
+            if l.startswith("    property int versionMajor:"):
+                updated_lines.append("    property int versionMajor: %s" % version.major)
+            elif l.startswith("    property int versionMinor:"):
+                updated_lines.append("    property int versionMinor: %s" % version.minor)
+            elif l.startswith("    property int versionPatch:"):
+                updated_lines.append("    property int versionPatch: %s" % version.patch)
             else:
                 updated_lines.append(l)
 
-        with open('CMakeLists.txt', 'w') as f:
+        with open('mellowplayer.qbs', 'w') as f:
             f.write('\n'.join(updated_lines))
 
 

scripts/promotion/public_promotion.py

@@ -2,5 +2,5 @@
 
 
 if __name__ == "__main__":
-    public_promotion(Type.BUG_FIX)
+    public_promotion(Type.MINOR)