Ubuntu Music App

Merge lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 into lp://staging/music-app

  1. refactor-bump-framework-1504
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 869
Merged at revision: 875
Proposed branch: lp://staging/~ahayzen/music-app/refactor-bump-framework-1504
Merge into: lp://staging/music-app
Diff against target: 1201 lines (+168/-153)
70 files modified
app/components/BlurredBackground.qml (+3/-3)
app/components/BlurredHeader.qml (+3/-3)
app/components/ColumnFlow.qml (+1/-1)
app/components/CoverGrid.qml (+3/-3)
app/components/Delegates/Card.qml (+3/-3)
app/components/Delegates/ListItemWithActions.qml (+2/-2)
app/components/Delegates/MusicListItem.qml (+2/-2)
app/components/Dialog/ContentHubErrorDialog.qml (+2/-2)
app/components/Dialog/ContentHubNotFoundDialog.qml (+2/-2)
app/components/Dialog/ContentHubWaitDialog.qml (+2/-2)
app/components/Dialog/EditPlaylistDialog.qml (+2/-2)
app/components/Dialog/NewPlaylistDialog.qml (+2/-2)
app/components/Dialog/RemovePlaylistDialog.qml (+2/-2)
app/components/Flickables/CardView.qml (+3/-3)
app/components/Flickables/MultiSelectListView.qml (+2/-2)
app/components/Flickables/MusicListView.qml (+2/-2)
app/components/HeadState/MultiSelectHeadState.qml (+2/-2)
app/components/HeadState/PlaylistsHeadState.qml (+2/-2)
app/components/HeadState/SearchHeadState.qml (+2/-2)
app/components/HeadState/SearchableHeadState.qml (+2/-2)
app/components/Helpers/ContentHubHelper.qml (+2/-2)
app/components/Helpers/UriHandlerHelper.qml (+2/-2)
app/components/Helpers/UserMetricsHelper.qml (+2/-2)
app/components/LibraryListModel.qml (+1/-1)
app/components/ListItemActions/AddToPlaylist.qml (+2/-2)
app/components/ListItemActions/AddToQueue.qml (+6/-5)
app/components/ListItemActions/CheckBox.qml (+3/-3)
app/components/ListItemActions/Remove.qml (+6/-5)
app/components/ListItemReorderComponent.qml (+2/-2)
app/components/LoadingSpinnerComponent.qml (+3/-3)
app/components/MusicPage.qml (+2/-2)
app/components/MusicRow.qml (+3/-3)
app/components/MusicToolbar.qml (+2/-2)
app/components/NowPlayingFullView.qml (+2/-2)
app/components/NowPlayingToolbar.qml (+2/-2)
app/components/Player.qml (+2/-2)
app/components/PlaylistsEmptyState.qml (+2/-2)
app/components/Queue.qml (+2/-2)
app/components/Style.qml (+2/-2)
app/components/Themes/Ambiance/BubbleShape.qml (+2/-2)
app/components/Themes/Ambiance/PartialColorize.qml (+1/-1)
app/components/Themes/Ambiance/PartialColorizeUbuntuShape.qml (+1/-1)
app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml (+2/-2)
app/components/ViewButton/PlayAllButton.qml (+2/-2)
app/components/ViewButton/QueueAllButton.qml (+2/-2)
app/components/ViewButton/ShuffleButton.qml (+2/-2)
app/components/Walkthrough/FirstRunWalkthrough.qml (+3/-3)
app/components/Walkthrough/Slide1.qml (+2/-2)
app/components/Walkthrough/Slide2.qml (+2/-2)
app/components/Walkthrough/Slide3.qml (+2/-2)
app/components/Walkthrough/Walkthrough.qml (+2/-2)
app/components/WorkerModelLoader.qml (+2/-2)
app/components/WorkerWaiter.qml (+2/-2)
app/music-app.qml (+6/-5)
app/ui/AddToPlaylist.qml (+2/-2)
app/ui/Albums.qml (+2/-2)
app/ui/ArtistView.qml (+3/-3)
app/ui/Artists.qml (+2/-2)
app/ui/Genres.qml (+2/-2)
app/ui/LibraryEmptyState.qml (+2/-2)
app/ui/NowPlaying.qml (+2/-2)
app/ui/Playlists.qml (+2/-2)
app/ui/Recent.qml (+3/-3)
app/ui/Songs.qml (+2/-2)
app/ui/SongsView.qml (+2/-2)
apparmor.json (+2/-2)
debian/changelog (+6/-0)
manifest.json.in (+2/-2)
music-app.qmltheme (+1/-1)
tests/autopilot/music_app/__init__.py (+8/-2)
To merge this branch: bzr merge lp://staging/~ahayzen/music-app/refactor-bump-framework-1504
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+258126@code.staging.launchpad.net

Commit message

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

Description of the change

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:857
http://91.189.93.70:8080/job/music-app-refactor-ci/71/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2704
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/71

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/71/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
858. By Andrew Hayzen

* Fixes for autopilot

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:858
http://91.189.93.70:8080/job/music-app-refactor-ci/72/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2705
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/72

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/72/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
859. By Andrew Hayzen

* Autopilot tweaks

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:859
http://91.189.93.70:8080/job/music-app-refactor-ci/73/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2706
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/73

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/73/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
860. By Andrew Hayzen

* Revert back to QtQuick2.3

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:860
http://91.189.93.70:8080/job/music-app-refactor-ci/74/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2707
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2707/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/74/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
861. By Andrew Hayzen

* Revert the Revert as jenkins is still on utopic so will fail anyway

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:861
http://91.189.93.70:8080/job/music-app-refactor-ci/75/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2708
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/33
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/75

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/75/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
862. By Andrew Hayzen

* Hacky solution to keep SDK autopilot helpers happy for now

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:862
http://91.189.93.70:8080/job/music-app-refactor-ci/76/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2709
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2709/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/76

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/76/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Due to https://bugs.launchpad.net/autopilot-qt/+bug/1341671 and https://bugs.launchpad.net/autopilot/+bug/1350532, it seems you need to select via objectname, and avoid making a class named MainView12.

lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
863. By Andrew Hayzen

* 'Correct' autopilot changes to work around bug 1350532

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:863
http://91.189.93.70:8080/job/music-app-refactor-ci/77/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2712
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/35
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/77

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/77/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:863
http://91.189.93.70:8080/job/music-app-refactor-ci/81/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2768
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/81/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

This is barfing due to lack of qtquick 2.4
"file:///usr/share/music-app/app/music-app.qml:20 module "QtQuick" version 2.4 is not installed"

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

This is due to jenkins using utopic and not vivid, and this mp moves to the vivid framework (it runs on a vivid desktop and device fine). We probably need to switch the jenkins tests to be run on vivid only when/as/if we land this.

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

We have requested that jenkins move to vivid. Am chasing that up.

lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
864. By Andrew Hayzen

* Merge of trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:864
http://91.189.93.70:8080/job/music-app-ci/1313/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/165

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1313/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Now that vivid has landed in stable we can work on getting this into trunk.

Before landing this, is it worth taking a cut of the branch for Utopic for historic reasons/for people who wanting to run from a PPA, etc? I suspect not.

Revision history for this message
Victor Thompson (vthompson) wrote :

Should we also refresh our upstream components in app/components/Themes to use the new Ubuntu.Components?

review: Needs Information
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
865. By Andrew Hayzen

* Also bump app/components/Themes/*

866. By Andrew Hayzen

* Merge of lp:music-app/refactor

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

I believe every QML file has the same level of imports now, please rereview.

I also vote we just land this, if we need branch utopic we can just do $ bzr branch lp:music-app -r <revision-before-this-lands>

Then this, the listitems and the other fixes we have can be in OTA5.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:866
http://91.189.93.70:8080/job/music-app-ci/1317/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/169

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1317/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

There are still instances with the old imports:

music-app.qmltheme:@qml-import(Ubuntu.Components 0.1);
app/components/ListItemActions/CheckBox.qml:import QtQuick 2.2

I say we remove the qmltheme file as it isn't being used.

review: Needs Fixing
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
867. By Andrew Hayzen

* Bump remaining files

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:867
http://91.189.93.70:8080/job/music-app-ci/1327/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/179

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1327/rebuild

review: Approve (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
868. By Andrew Hayzen

* Bump app versions from 2.1 to 2.2

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:868
http://91.189.93.70:8080/job/music-app-ci/1328/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/180/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1328/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ahayzen/music-app/refactor-bump-framework-1504 updated
869. By Andrew Hayzen

* Add changelog line

Revision history for this message
Victor Thompson (vthompson) wrote :

lgtm!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches