Opened 2 years ago

Closed 2 years ago

Last modified 6 weeks 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 (6)

comment:1 Changed 2 years ago by dzhang

  • Description modified (diff)

comment:2 Changed 2 years ago by dzhang

  • Description modified (diff)

comment:3 Changed 2 years ago by dzhang

  • Description modified (diff)

comment:4 Changed 2 years ago by dzhang

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

comment:5 Changed 2 years 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.

Version 0, edited 2 years ago by dzhang (next)

comment:6 Changed 5 months ago by modifaku

spam

Last edited 6 weeks ago by kzar (previous) (diff)
Note: See TracTickets for help on using tickets.