Opened on 09/20/2017 at 10:24:21 PM
Closed on 09/23/2017 at 01:06:39 AM
Last modified on 10/08/2019 at 05:56:44 PM
#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].
Attachments (0)
Change History (6)
comment:4 Changed on 09/21/2017 at 02:04:33 AM by dzhang
- Summary changed from Synchronize ABP master to swift branch to Synchronize ABP master and swift branch
comment:5 Changed on 09/23/2017 at 01:06:39 AM by dzhang
- Description modified (diff)
- Resolution set to fixed
- Status changed from new to closed
Last edited on 09/23/2017 at 01:19:34 AM
by dzhang
comment:6 Changed on 06/21/2019 at 06:01:53 AM by modifaku
spam
Last edited on 10/08/2019 at 05:56:44 PM
by kzar
Note: See
TracTickets for help on using
tickets.
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.