Opened 21 months ago

Closed 21 months ago

Last modified 21 months ago

#5745 closed change (fixed)

Synchronize ABP master and swift branch

Reported by: dzhang Assignee: dzhang
Priority: Unknown Milestone: Adblock-Plus-for-iOS-next
Module: Adblock-Plus-for-iOS/macOS Keywords:
Cc: mario, tiago, ashephard, CraftyDeano Blocked By:
Blocking: Platform: iOS
Ready: yes Confidential: no
Tester: Unknown Verified working: no
Review URL(s):

Description (last modified by dzhang)

Background

We are synchronizing ABP [master] with the [swift] branch to gain the replacement of Cocoapods with Carthage that is already integrated on the [swift] branch.

Following this change, Swift development will take place on the [swift] branch and legacy development/maintenance will happen on the [master] branch.

What to change

Synchronize [master] with [swift].

Change History (5)

comment:1 Changed 21 months ago by dzhang

  • Description modified (diff)

comment:2 Changed 21 months ago by dzhang

  • Description modified (diff)

comment:3 Changed 21 months ago by dzhang

  • Description modified (diff)

comment:4 Changed 21 months ago by dzhang

  • Summary changed from Synchronize ABP master to swift branch to Synchronize ABP master and swift branch

comment:5 Changed 21 months ago by dzhang

  • Description modified (diff)
  • Resolution set to fixed
  • Status changed from new to closed

Merged "swift" into master to get Carthage. Rebased master onto "swift" to sync the two branches.

This was a slightly different procedure from what was originally discussed due to the previous push of the Xcode project apparently clearing up conflicts with that file. The end result of syncing the branches was achieved.

Last edited 21 months ago by dzhang (previous) (diff)
Note: See TracTickets for help on using tickets.