Opened 10 months ago

Closed 10 months ago

Last modified 8 months ago

#6933 closed change (fixed)

Update adblockpluscore to dcda4859fcbd (and adblockplusui for compatibility)

Reported by: greiner Assignee:
Priority: P2 Milestone: Adblock-Plus-3.4-for-Chrome-Opera-Firefox
Module: Platform Keywords:
Cc: sebastian, mjethani, wspee Blocked By: #6876, #6907, #6921
Blocking: #6892 Platform: Unknown / Cross platform
Ready: yes Confidential: no
Tester: Ross Verified working: yes
Review URL(s):

https://codereview.adblockplus.org/29877564/

Description (last modified by sebastian)

Background

This dependency update pulls in following changes from adblockpluscore:

  • #6741 - Use ECMAScript 2015 classes (changesets 4520c259dbcf, cd488181bf4f, bb99b7ba5b05, and 84ea8a5e3951)
  • #6870 - Remove support for legacy :-abp-properties() syntax
  • #6893 - Split out the INIParser class into its own file
  • #6854 - Remove deprecated FilterNotifier methods
  • #6891 - Properly distinguish objects from classes (changeset 4ac82a57f7bd)
  • #6862 - Make Snippets module emit events
  • #6883 - Use filterToRegExp in lib/filterClasses.js
  • #6919 - Implement hide-if-contains-and-matches-style snippet
  • #6916 - Avoid Set object for filters with only one subscription
  • #6868 - Rewrite filter with wildcard doesn't match end of URL
  • #6908 - Pass updated subscription's old filters as an event argument
  • #6927 - Expose pattern from RegExpFilter
  • #6931 - localhost isn't considered a domain by content filter validating code
  • #6923 - Only parse metadata from special comments at the top of the file

For compatibility we have to simultaneously pull in following changes from adblockplusui:


What to change

  • Change adblockplusui dependency to hg:b6392804edfe git:cb795db.
  • Change adblockpluscore dependency to hg:dcda4859fcbd git:c9dc573.
  • Adapt for the changes in #6907 and #6916 (see the respective integration notes).

Hints for testers

See hints for testers section in the individual tickets. If the necessary information is missing, please leave a comment asking for details/clarification.

Change History (21)

comment:1 Changed 10 months ago by greiner

  • Description modified (diff)

comment:2 Changed 10 months ago by greiner

  • Blocked By 6907 added

comment:3 Changed 10 months ago by greiner

  • Blocked By 6921 added

comment:4 Changed 10 months ago by greiner

  • Blocked By 6876 added

comment:5 Changed 10 months ago by greiner

  • Cc sebastian mjethani added
  • Priority changed from P3 to Unknown

comment:6 Changed 10 months ago by greiner

I've created this ticket for the simultaneous update of the Core and UI dependencies.

As the UI changes depend on which Core changes will end up making it into the next release, they haven't been pushed to Mercurial yet. However, as soon as we know which Core revision we want to update to, we'll also be able to finalize the UI changes and push them live.

comment:7 Changed 10 months ago by greiner

  • Cc wspee added

comment:8 follow-up: Changed 10 months ago by sebastian

  • Summary changed from Update adblockplusui dependency to TBD (release-2018-3.3) to Update adblockpluscore and adblockplusui dependency to TBD (release-2018-3.3)

We would want to update to whatever the latest revision of master@adblockpluscore will be at the time. But I don't expect any further changes landing that will require changes to the UI.

comment:9 in reply to: ↑ 8 Changed 10 months ago by mjethani

Replying to sebastian:

But I don't expect any further changes landing that will require changes to the UI.

If we're going into code freeze for ABP 3.4 soon, we can commit to not making any more breaking changes to core. When we update the dependency, we'll branch off core into a new next branch as decided previously.

comment:10 Changed 10 months ago by greiner

  • Description modified (diff)

Added revisions.

comment:11 Changed 10 months ago by mjethani

  • Description modified (diff)

comment:12 Changed 10 months ago by mjethani

  • Review URL(s) modified (diff)

comment:13 Changed 10 months ago by mjethani

  • Description modified (diff)

comment:14 Changed 10 months ago by mjethani

  • Description modified (diff)

comment:15 Changed 10 months ago by mjethani

  • Description modified (diff)

comment:16 Changed 10 months ago by mjethani

  • Description modified (diff)

comment:17 Changed 10 months ago by mjethani

  • Summary changed from Update adblockpluscore and adblockplusui dependency to TBD (release-2018-3.3) to Update adblockpluscore and adblockplusui dependency to hg:dcda4859fcbd and hg:b6392804edfe (release-2018-3.3)

comment:18 Changed 10 months ago by abpbot

A commit referencing this issue has landed:
Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd

comment:19 Changed 10 months ago by mjethani

The above change was landed on the next branch, is it going to make it to master and the development builds?

comment:20 Changed 10 months ago by sebastian

  • Description modified (diff)
  • Milestone set to Adblock-Plus-for-Chrome-Opera-Firefox-next
  • Priority changed from Unknown to P2
  • Ready set
  • Resolution set to fixed
  • Status changed from new to closed
  • Summary changed from Update adblockpluscore and adblockplusui dependency to hg:dcda4859fcbd and hg:b6392804edfe (release-2018-3.3) to Update adblockpluscore to dcda4859fcbd (and adblockplusui for compatibility)

Yes, I will merge next into master soon (development builds are built from master).

I'm mostly just waiting for the dependency update that pulls in the remaining changes (and related translations) from adblockplusui before we can start testing.

The reason I don't merge next into master yet, is once we do we will be unable to do any further snippet-only or hotfix releases. So I wait until we actually start testing for 3.4.

comment:21 Changed 8 months ago by Ross

  • Tester changed from Unknown to Ross
  • Verified working set

This can be verified now.

ABP 3.3.2.2176
Firefox 62 / 51 / Windows 10
Chrome 69 / 49 / Windows 10
Opera 56 / 36 / Windows 10

Note: See TracTickets for help on using tickets.