diff options
| author | burivuh <burivuh@maps.me> | 2017-03-15 16:46:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 16:46:30 +0300 |
| commit | eac447f28f6ee5666fbc1b506e116a5fd5b242b6 (patch) | |
| tree | 0830054f942e25b9f39f8cc5a8f6eaa31178ef41 | |
| parent | 83c696e6f58432c8a0acc1e0f71df5b8dce274bc (diff) | |
| parent | dc12f4f57a7e5c8f44767939d47eeeef393dc2e0 (diff) | |
[release-72-carthage] [ios] Moved frameworks to Carthage.
45 files changed, 785 insertions, 558 deletions
diff --git a/.gitignore b/.gitignore index c8b592f9cd..83b11973c9 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,15 @@ tools/emacsmode/build **/xcshareddata **/xcuserdata +# Carthage +iphone/Maps/3party/Carthage/Checkouts +iphone/Maps/3party/Carthage/Build/Mac +iphone/Maps/3party/Carthage/Build/tvOS +iphone/Maps/3party/Carthage/Build/watchOS +iphone/Maps/3party/Carthage/Build/iOS/*.bcsymbolmap +iphone/Maps/3party/Carthage/Build/iOS/*.dSYM +iphone/Maps/3party/Carthage/Build/*.version + # GeneratedFiles version/version.hpp tools/win/MapsWithMe* diff --git a/iphone/Maps/3party/Alamofire.framework/Info.plist b/iphone/Maps/3party/Alamofire.framework/Info.plist Binary files differdeleted file mode 100644 index 6538931815..0000000000 --- a/iphone/Maps/3party/Alamofire.framework/Info.plist +++ /dev/null diff --git a/iphone/Maps/3party/Alamofire.framework/_CodeSignature/CodeResources b/iphone/Maps/3party/Alamofire.framework/_CodeSignature/CodeResources deleted file mode 100644 index 7cbda4ac73..0000000000 --- a/iphone/Maps/3party/Alamofire.framework/_CodeSignature/CodeResources +++ /dev/null @@ -1,226 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>files</key> - <dict> - <key>Headers/Alamofire-Swift.h</key> - <data> - SFPVdVQ/svTxlsI/3SUHew8JX20= - </data> - <key>Headers/Alamofire.h</key> - <data> - MkxSbVCbnr649u1kjJl/qmydvNQ= - </data> - <key>Info.plist</key> - <data> - VCyfdQHa+jSxTUTjGAnf0WtbL8o= - </data> - <key>Modules/Alamofire.swiftmodule/i386.swiftdoc</key> - <data> - tdLMJsNiw9W8nt9ktpuWPGHe87M= - </data> - <key>Modules/Alamofire.swiftmodule/i386.swiftmodule</key> - <data> - 6C9xGHWHnh4maYd7l09Tl2Kp/74= - </data> - <key>Modules/Alamofire.swiftmodule/x86_64.swiftdoc</key> - <data> - tSsVFvyDedjVPTirI+tsNHgz8Sw= - </data> - <key>Modules/Alamofire.swiftmodule/x86_64.swiftmodule</key> - <data> - +wfwLWUq+4FGijzZPC8xZCA8mZs= - </data> - <key>Modules/module.modulemap</key> - <data> - oUms7QxpPFGK02DLqqScqq/7uwc= - </data> - </dict> - <key>files2</key> - <dict> - <key>Headers/Alamofire-Swift.h</key> - <dict> - <key>hash</key> - <data> - SFPVdVQ/svTxlsI/3SUHew8JX20= - </data> - <key>hash2</key> - <data> - 04jCBxpdkfWq7VbGia6FDdCRFf595ntXyuF2MLmTNS0= - </data> - </dict> - <key>Headers/Alamofire.h</key> - <dict> - <key>hash</key> - <data> - MkxSbVCbnr649u1kjJl/qmydvNQ= - </data> - <key>hash2</key> - <data> - sVJkysHFIbUiAzfAq/iru6/B7jmxx8gOxi2Too0HdRk= - </data> - </dict> - <key>Modules/Alamofire.swiftmodule/i386.swiftdoc</key> - <dict> - <key>hash</key> - <data> - tdLMJsNiw9W8nt9ktpuWPGHe87M= - </data> - <key>hash2</key> - <data> - dmr2aEJcMkokkKDi3G2jMRTWq0K06MqpdmOKG9JzjMo= - </data> - </dict> - <key>Modules/Alamofire.swiftmodule/i386.swiftmodule</key> - <dict> - <key>hash</key> - <data> - 6C9xGHWHnh4maYd7l09Tl2Kp/74= - </data> - <key>hash2</key> - <data> - AIo8hg7n2SqYhnt7TSpeVsd39t4raoEUKkyMFzFTOI0= - </data> - </dict> - <key>Modules/Alamofire.swiftmodule/x86_64.swiftdoc</key> - <dict> - <key>hash</key> - <data> - tSsVFvyDedjVPTirI+tsNHgz8Sw= - </data> - <key>hash2</key> - <data> - VLgnOSEox9dGsI/FDzQ3CR5RJ3OwNcpfCptVMuYphTo= - </data> - </dict> - <key>Modules/Alamofire.swiftmodule/x86_64.swiftmodule</key> - <dict> - <key>hash</key> - <data> - +wfwLWUq+4FGijzZPC8xZCA8mZs= - </data> - <key>hash2</key> - <data> - NbWXplTLc8A6PRxyuK+/oG7T579AffOs0yqMpN9iQZQ= - </data> - </dict> - <key>Modules/module.modulemap</key> - <dict> - <key>hash</key> - <data> - oUms7QxpPFGK02DLqqScqq/7uwc= - </data> - <key>hash2</key> - <data> - X5wPIcDrMTwT6S06SivZ1wK27iG5+mZMqjrF5cG4PBs= - </data> - </dict> - </dict> - <key>rules</key> - <dict> - <key>^</key> - <true/> - <key>^.*\.lproj/</key> - <dict> - <key>optional</key> - <true/> - <key>weight</key> - <real>1000</real> - </dict> - <key>^.*\.lproj/locversion.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>1100</real> - </dict> - <key>^Base\.lproj/</key> - <dict> - <key>weight</key> - <real>1010</real> - </dict> - <key>^version.plist$</key> - <true/> - </dict> - <key>rules2</key> - <dict> - <key>.*\.dSYM($|/)</key> - <dict> - <key>weight</key> - <real>11</real> - </dict> - <key>^</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - <key>^(.*/)?\.DS_Store$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>2000</real> - </dict> - <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> - <key>^.*</key> - <true/> - <key>^.*\.lproj/</key> - <dict> - <key>optional</key> - <true/> - <key>weight</key> - <real>1000</real> - </dict> - <key>^.*\.lproj/locversion.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>1100</real> - </dict> - <key>^Base\.lproj/</key> - <dict> - <key>weight</key> - <real>1010</real> - </dict> - <key>^Info\.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>20</real> - </dict> - <key>^PkgInfo$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>20</real> - </dict> - <key>^[^/]+$</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> - <key>^embedded\.provisionprofile$</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - <key>^version\.plist$</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - </dict> -</dict> -</plist> diff --git a/iphone/Maps/3party/AlamofireImage.framework/Info.plist b/iphone/Maps/3party/AlamofireImage.framework/Info.plist Binary files differdeleted file mode 100644 index 44312eb145..0000000000 --- a/iphone/Maps/3party/AlamofireImage.framework/Info.plist +++ /dev/null diff --git a/iphone/Maps/3party/AlamofireImage.framework/_CodeSignature/CodeResources b/iphone/Maps/3party/AlamofireImage.framework/_CodeSignature/CodeResources deleted file mode 100644 index 7ced2db89c..0000000000 --- a/iphone/Maps/3party/AlamofireImage.framework/_CodeSignature/CodeResources +++ /dev/null @@ -1,226 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>files</key> - <dict> - <key>Headers/AlamofireImage-Swift.h</key> - <data> - JFicqxVgqobOmR3b0YTLjleOk7c= - </data> - <key>Headers/AlamofireImage.h</key> - <data> - vmy8LU0HHftzzb+tYY80jjkKZYw= - </data> - <key>Info.plist</key> - <data> - zPZOZE/55pWLsHm5sSLLuIYtxwA= - </data> - <key>Modules/AlamofireImage.swiftmodule/i386.swiftdoc</key> - <data> - Za3627T/XzCDFRDrzqkno8GifZI= - </data> - <key>Modules/AlamofireImage.swiftmodule/i386.swiftmodule</key> - <data> - 7Py+UE0qO7P4SFLp8bCk9hyb5yw= - </data> - <key>Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc</key> - <data> - QE69R8dJUhf3/lcX47TW2x1JFCY= - </data> - <key>Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule</key> - <data> - kwTj1jXkL9IJq5XZSdreTEeSEuY= - </data> - <key>Modules/module.modulemap</key> - <data> - vpB0CcDHBtOKW9Elgsq77zXlFYA= - </data> - </dict> - <key>files2</key> - <dict> - <key>Headers/AlamofireImage-Swift.h</key> - <dict> - <key>hash</key> - <data> - JFicqxVgqobOmR3b0YTLjleOk7c= - </data> - <key>hash2</key> - <data> - e7XUH5rN8B/N82Vo7uf8mkOj2D37jnQhopAR33zPWWY= - </data> - </dict> - <key>Headers/AlamofireImage.h</key> - <dict> - <key>hash</key> - <data> - vmy8LU0HHftzzb+tYY80jjkKZYw= - </data> - <key>hash2</key> - <data> - Z7/dyoJDsD7X7fr1WD3SWQ5UXjdT+YmiKy/8xWS9hMQ= - </data> - </dict> - <key>Modules/AlamofireImage.swiftmodule/i386.swiftdoc</key> - <dict> - <key>hash</key> - <data> - Za3627T/XzCDFRDrzqkno8GifZI= - </data> - <key>hash2</key> - <data> - f4KqttxT8jmAv0UZj1bWGUK6SW/XoE3msIkSfUHwz+I= - </data> - </dict> - <key>Modules/AlamofireImage.swiftmodule/i386.swiftmodule</key> - <dict> - <key>hash</key> - <data> - 7Py+UE0qO7P4SFLp8bCk9hyb5yw= - </data> - <key>hash2</key> - <data> - KQ+6arj+OvqQ10MjpDf1GFRbqR4uO5j0//Ds/G9T+no= - </data> - </dict> - <key>Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc</key> - <dict> - <key>hash</key> - <data> - QE69R8dJUhf3/lcX47TW2x1JFCY= - </data> - <key>hash2</key> - <data> - IrKWScUe6diBnlr2j/Xbq3SJpvB2axvDV3t0YSz6DGc= - </data> - </dict> - <key>Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule</key> - <dict> - <key>hash</key> - <data> - kwTj1jXkL9IJq5XZSdreTEeSEuY= - </data> - <key>hash2</key> - <data> - vt07WNfvn365kKmIqCL01kLJ+4+Z0jhmXNO9dnsQB8g= - </data> - </dict> - <key>Modules/module.modulemap</key> - <dict> - <key>hash</key> - <data> - vpB0CcDHBtOKW9Elgsq77zXlFYA= - </data> - <key>hash2</key> - <data> - EBublwpOyIMDR9Rt2/NVBv4jQ3sY08yEaOKE82fbM1Q= - </data> - </dict> - </dict> - <key>rules</key> - <dict> - <key>^</key> - <true/> - <key>^.*\.lproj/</key> - <dict> - <key>optional</key> - <true/> - <key>weight</key> - <real>1000</real> - </dict> - <key>^.*\.lproj/locversion.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>1100</real> - </dict> - <key>^Base\.lproj/</key> - <dict> - <key>weight</key> - <real>1010</real> - </dict> - <key>^version.plist$</key> - <true/> - </dict> - <key>rules2</key> - <dict> - <key>.*\.dSYM($|/)</key> - <dict> - <key>weight</key> - <real>11</real> - </dict> - <key>^</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - <key>^(.*/)?\.DS_Store$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>2000</real> - </dict> - <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> - <key>^.*</key> - <true/> - <key>^.*\.lproj/</key> - <dict> - <key>optional</key> - <true/> - <key>weight</key> - <real>1000</real> - </dict> - <key>^.*\.lproj/locversion.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>1100</real> - </dict> - <key>^Base\.lproj/</key> - <dict> - <key>weight</key> - <real>1010</real> - </dict> - <key>^Info\.plist$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>20</real> - </dict> - <key>^PkgInfo$</key> - <dict> - <key>omit</key> - <true/> - <key>weight</key> - <real>20</real> - </dict> - <key>^[^/]+$</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> - <key>^embedded\.provisionprofile$</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - <key>^version\.plist$</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> - </dict> -</dict> -</plist> diff --git a/iphone/Maps/3party/Cartfile b/iphone/Maps/3party/Cartfile new file mode 100644 index 0000000000..4a7b7a8aa2 --- /dev/null +++ b/iphone/Maps/3party/Cartfile @@ -0,0 +1,3 @@ +github "Alamofire/Alamofire" +github "Alamofire/AlamofireImage" +github "Pushwoosh/pushwoosh-ios-sdk" diff --git a/iphone/Maps/3party/Cartfile.resolved b/iphone/Maps/3party/Cartfile.resolved new file mode 100644 index 0000000000..2095e32f5e --- /dev/null +++ b/iphone/Maps/3party/Cartfile.resolved @@ -0,0 +1,3 @@ +github "Alamofire/Alamofire" "4.4.0" +github "Alamofire/AlamofireImage" "3.2.0" +github "Pushwoosh/pushwoosh-ios-sdk" "5.1.2" diff --git a/iphone/Maps/3party/Alamofire.framework/Alamofire b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Alamofire Binary files differindex 626758c96d..3a8e369e54 100755 --- a/iphone/Maps/3party/Alamofire.framework/Alamofire +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Alamofire diff --git a/iphone/Maps/3party/Alamofire.framework/Headers/Alamofire-Swift.h b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h index 677c8bd49f..677c8bd49f 100644 --- a/iphone/Maps/3party/Alamofire.framework/Headers/Alamofire-Swift.h +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h diff --git a/iphone/Maps/3party/Alamofire.framework/Headers/Alamofire.h b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire.h index 8d45b7758d..8d45b7758d 100644 --- a/iphone/Maps/3party/Alamofire.framework/Headers/Alamofire.h +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire.h diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Info.plist b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Info.plist Binary files differnew file mode 100644 index 0000000000..82613838b5 --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Info.plist diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc Binary files differindex 9742d3b774..9742d3b774 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule Binary files differindex 24f2f7894f..af9ec911c9 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc Binary files differindex 68f8a26450..68f8a26450 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule Binary files differindex 8f66a14af5..9985a0d616 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc Binary files differindex 827a0ebfb8..827a0ebfb8 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule Binary files differindex 3266eaee28..383c2085bc 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc Binary files differindex 993a59a049..993a59a049 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule Binary files differindex 8373970a2a..3f8065966b 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule diff --git a/iphone/Maps/3party/Alamofire.framework/Modules/module.modulemap b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/module.modulemap index 8096dcc9b3..8096dcc9b3 100644 --- a/iphone/Maps/3party/Alamofire.framework/Modules/module.modulemap +++ b/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Modules/module.modulemap diff --git a/iphone/Maps/3party/AlamofireImage.framework/AlamofireImage b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/AlamofireImage Binary files differindex d55b1b200a..2bbf779a89 100755 --- a/iphone/Maps/3party/AlamofireImage.framework/AlamofireImage +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/AlamofireImage diff --git a/iphone/Maps/3party/AlamofireImage.framework/Headers/AlamofireImage-Swift.h b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Headers/AlamofireImage-Swift.h index 46f5bff6b6..46f5bff6b6 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Headers/AlamofireImage-Swift.h +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Headers/AlamofireImage-Swift.h diff --git a/iphone/Maps/3party/AlamofireImage.framework/Headers/AlamofireImage.h b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Headers/AlamofireImage.h index 9989aa7e4d..9989aa7e4d 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Headers/AlamofireImage.h +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Headers/AlamofireImage.h diff --git a/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Info.plist b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Info.plist Binary files differnew file mode 100644 index 0000000000..e374c91e78 --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Info.plist diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftdoc Binary files differindex c97b332b8e..fe29225a71 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftdoc diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftmodule Binary files differindex d315ab7328..9a55dc9fff 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftmodule diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftdoc Binary files differindex a2544ed01f..690e35ac22 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftdoc diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftmodule Binary files differindex 343d3fa978..91de8404bf 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm64.swiftmodule diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftdoc Binary files differindex ddd45e7806..a1300e7124 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftdoc diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftmodule Binary files differindex 347855cac9..e8e948c15a 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/arm.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/i386.swiftmodule diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc Binary files differindex b7211fbd4d..3bf660d1ad 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftdoc diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule Binary files differindex 91644d02b5..4fbb72cf7d 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/AlamofireImage.swiftmodule/x86_64.swiftmodule diff --git a/iphone/Maps/3party/AlamofireImage.framework/Modules/module.modulemap b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/module.modulemap index 597ab7b55d..597ab7b55d 100644 --- a/iphone/Maps/3party/AlamofireImage.framework/Modules/module.modulemap +++ b/iphone/Maps/3party/Carthage/Build/iOS/AlamofireImage.framework/Modules/module.modulemap diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PWInAppManager.h b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PWInAppManager.h new file mode 100644 index 0000000000..1fd3d5f5bd --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PWInAppManager.h @@ -0,0 +1,125 @@ +// +// PWInAppManager.h +// Pushwoosh SDK +// (c) Pushwoosh 2017 +// + +#import <Foundation/Foundation.h> + +/** + `PWJavaScriptInterface` protocol is a representation of Javascript object that can be added at runtime into In-App Message HTML page + to provide native calls and callbacks to Objective-C/Swift. + + Example: + + ```ObjC + @implementation JavaScriptInterface + + - (void)nativeCall:(NSString*)str :(PWJavaScriptCallback*)callback { + [callback executeWithParam:str]; + } + + @end + + ... + + [[PWInAppManager sharedManager] addJavascriptInterface:[JavaScriptInterface new] withName:@"ObjC"]; + ``` + + ```javascript + ObjC.nativeCall("exampleString", function(str) { + console.log(str); + }); + ``` + */ +@protocol PWJavaScriptInterface + +@optional + +/** + Tells the delegate that In-App Message load stated + */ +- (void)onWebViewStartLoad:(UIWebView*)webView; + +/** + Tells the delegate that In-App Message load finished + */ +- (void)onWebViewFinishLoad:(UIWebView*)webView; + +/** + Tells the delegate that In-App Message is closing + */ +- (void)onWebViewStartClose:(UIWebView*)webView; + +@end + +/** + `PWJavaScriptCallback` is a representation of Javascript function + */ +@interface PWJavaScriptCallback : NSObject + +/** + Invokes callback with no arguments + */ +- (NSString*) execute; + +/** + Invokes callback with one argument + */ +- (NSString*) executeWithParam: (NSString*) param; + +/** + Invokes callback with multiple arguments + */ +- (NSString*) executeWithParams: (NSArray*) params; + +@end + +/* + `PWInAppManager` class offers access to the singletone-instance of the inapp messages manager responsible for sending events and managing inapp message notifications. + */ +@interface PWInAppManager : NSObject + ++ (instancetype)sharedManager; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + */ +- (void)setUserId:(NSString *)userId; + +/** + Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed. + + @param oldUserId source user + @param newUserId destination user + @param doMerge if false all events for oldUserId are removed, if true all events for oldUserId are moved to newUserId + @param completion callback + */ +- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion; + +/** + Post events for In-App Messages. This can trigger In-App message display as specified in Pushwoosh Control Panel. + + Example: + + [[PWInAppManager sharedManager] setUserId:@"96da2f590cd7246bbde0051047b0d6f7"]; + [[PWInAppManager sharedManager] postEvent:@"buttonPressed" withAttributes:@{ @"buttonNumber" : @"4", @"buttonLabel" : @"Banner" } completion:nil]; + + @param event name of the event + @param attributes NSDictionary of event attributes + @param completion function to call after posting event + */ +- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes completion:(void (^)(NSError *error))completion; + +/** + See `postEvent:withAttributes:completion:` + */ +- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes; + +/** + Adds javascript interface for In-App Messages. Interface will be accessible from javascript as object with specified `name` and functions defined in `interface` class. + */ +- (void)addJavascriptInterface:(NSObject<PWJavaScriptInterface>*)interface withName:(NSString*)name; + +@end diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PushNotificationManager.h b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PushNotificationManager.h new file mode 100644 index 0000000000..d5d9811177 --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/PushNotificationManager.h @@ -0,0 +1,467 @@ +// +// PushNotificationManager.h +// Pushwoosh SDK +// (c) Pushwoosh 2014 +// + +#import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> +#import <StoreKit/StoreKit.h> +#import <UserNotifications/UserNotifications.h> + +#define PUSHWOOSH_VERSION @"5.1.2" + + +@class PushNotificationManager; +@class CLLocation; + +typedef void (^PushwooshGetTagsHandler)(NSDictionary *tags); +typedef void (^PushwooshErrorHandler)(NSError *error); + +/** + `PushNotificationDelegate` protocol defines the methods that can be implemented in the delegate of the `PushNotificationManager` class' singleton object. + These methods provide information about the key events for push notification manager such as registering with APS services, receiving push notifications or working with the received notification. + These methods implementation allows to react on these events properly. + */ +@protocol PushNotificationDelegate + +@optional +/** + Tells the delegate that the application has registered with Apple Push Service (APS) successfully. + + @param token A token used for identifying the device with APS. + */ +- (void)onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token; + +/** + Sent to the delegate when Apple Push Service (APS) could not complete the registration process successfully. + + @param error An NSError object encapsulating the information about the reason of the registration failure. Within this method you can define application's behaviour in case of registration failure. + */ +- (void)onDidFailToRegisterForRemoteNotificationsWithError:(NSError *)error; + +/** + Tells the delegate that the push manager has received a remote notification. + + If this method is implemented `onPushAccepted:withNotification:` will not be called, internal message boxes will not be displayed. + + @param pushManager The push manager that received the remote notification. + @param pushNotification A dictionary that contains information referring to the remote notification, potentially including a badge number for the application icon, an alert sound, an alert message to display to the user, a notification identifier, and custom data. + The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull. + @param onStart If the application was not active when the push notification was received, the application will be launched with this parameter equal to `YES`, otherwise the parameter will be `NO`. + */ +- (void)onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart; + +/** + Tells the delegate that the user has pressed OK on the push notification. + IMPORTANT: This method is used for backwards compatibility and is deprecated. Please use the `onPushAccepted:withNotification:onStart:` method instead + + @param pushManager The push manager that received the remote notification. + @param pushNotification A dictionary that contains information referring to the remote notification, potentially including a badge number for the application icon, an alert sound, an alert message to display to the user, a notification identifier, and custom data. + The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull. + Push dictionary sample: + + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } + + */ +- (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification; + +/** + Tells the delegate that the user has pressed OK on the push notification. + + @param pushManager The push manager that received the remote notification. + @param pushNotification A dictionary that contains information about the remote notification, potentially including a badge number for the application icon, an alert sound, an alert message to display to the user, a notification identifier, and custom data. + The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull. + Push dictionary sample: + + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } + + @param onStart If the application was not active when the push notification was received, the application will be launched with this parameter equal to `YES`, otherwise the parameter will be `NO`. + */ +- (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart; + +/** + Tells the delegate that the push manager has received tags from the server. + + @param tags Dictionary representation of received tags. + Dictionary example: + + { + Country = ru; + Language = ru; + } + + */ +- (void)onTagsReceived:(NSDictionary *)tags; + +/** + Sent to the delegate when push manager could not complete the tags receiving process successfully. + + @param error An NSError object that encapsulates information why receiving tags did not succeed. + */ +- (void)onTagsFailedToReceive:(NSError *)error; + +/** + Tells the delegate that In-App with specified code has been closed + + @param code In-App code + */ +- (void)onInAppClosed:(NSString *)code; + +/** + Tells the delegate that In-App with specified code has been displayed + + @param code In-App code + */ +- (void)onInAppDisplayed:(NSString *)code; + +@end + +/** + `PWTags` class encapsulates the methods for creating tags parameters for sending them to the server. + */ +@interface PWTags : NSObject + +/** + Creates a dictionary for incrementing/decrementing a numeric tag on the server. + + Example: + + NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys: + aliasField.text, @"Alias", + [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", + [PWTags incrementalTagWithInteger:5], @"price", + nil]; + + [[PushNotificationManager pushManager] setTags:tags]; + + @param delta Difference that needs to be applied to the tag's counter. + + @return Dictionary, that needs to be sent as the value for the tag + */ ++ (NSDictionary *)incrementalTagWithInteger:(NSInteger)delta; + +@end + +/** + `PushNotificationManager` class offers access to the singletone-instance of the push manager responsible for registering the device with the APS servers, receiving and processing push notifications. + */ +@interface PushNotificationManager : NSObject { +} + +/** + Pushwoosh Application ID. Usually retrieved automatically from Info.plist parameter `Pushwoosh_APPID` + */ +@property (nonatomic, copy, readonly) NSString *appCode; + +/** + Application name. Usually retrieved automatically from Info.plist bundle name (CFBundleDisplayName). Could be used to override bundle name. In addition could be set in Info.plist as `Pushwoosh_APPNAME` parameter. + */ +@property (nonatomic, copy, readonly) NSString *appName; + +/** + `PushNotificationDelegate` protocol delegate that would receive the information about events for push notification manager such as registering with APS services, receiving push notifications or working with the received notification. + Pushwoosh Runtime sets it to ApplicationDelegate by default + */ +@property (nonatomic, weak) NSObject<PushNotificationDelegate> *delegate; + +/** + Show push notifications alert when push notification is received while the app is running, default is `YES` + */ +@property (nonatomic, assign) BOOL showPushnotificationAlert; + +/** + Returns push notification payload if the app was started in response to push notification or null otherwise + */ +@property (nonatomic, copy, readonly) NSDictionary *launchNotification; + +/** + Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10 + */ +@property (nonatomic, strong, readonly) id<UNUserNotificationCenterDelegate> notificationCenterDelegate; + +/** + Initializes PushNotificationManager. Usually called by Pushwoosh Runtime internally. + @param appCode Pushwoosh App ID. + @param appName Application name. + */ ++ (void)initializeWithAppCode:(NSString *)appCode appName:(NSString *)appName; + +/** + Returns an object representing the current push manager. + + @return A singleton object that represents the push manager. + */ ++ (PushNotificationManager *)pushManager; + +/** + Registers for push notifications. By default registeres for "UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert" flags. + Automatically detects if you have "newsstand-content" in "UIBackgroundModes" and adds "UIRemoteNotificationTypeNewsstandContentAvailability" flag. + */ +- (void)registerForPushNotifications; + +/** + Unregisters from push notifications. You should call this method in rare circumstances only, such as when a new version of the app drops support for remote notifications. Users can temporarily prevent apps from receiving remote notifications through the Notifications section of the Settings app. Apps unregistered through this method can always re-register. + */ +- (void)unregisterForPushNotifications; + +- (instancetype)initWithApplicationCode:(NSString *)appCode appName:(NSString *)appName; +- (id)initWithApplicationCode:(NSString *)appCode navController:(UIViewController *)navController appName:(NSString *)appName __attribute__((deprecated)); + +/** + Sends geolocation to the server for GeoFencing push technology. Called internally, please use `startLocationTracking` and `stopLocationTracking` functions. + + @param location Location to be sent. + */ +- (void)sendLocation:(CLLocation *)location; + +/** + Start location tracking. + */ +- (void)startLocationTracking; + +/** + Stops location tracking + */ +- (void)stopLocationTracking; + +/** + Send tags to server. Tag names have to be created in the Pushwoosh Control Panel. Possible tag types: Integer, String, Incremental (integer only), List tags (array of values). + + Example: + + NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys: + aliasField.text, @"Alias", + [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", + [PWTags incrementalTagWithInteger:5], @"price", + [NSArray arrayWithObjects:@"Item1", @"Item2", @"Item3", nil], @"List", + nil]; + + [[PushNotificationManager pushManager] setTags:tags]; + + @param tags Dictionary representation of tags to send. + */ +- (void)setTags:(NSDictionary *)tags; + +/** + Send tags to server with completion block. If setTags succeeds competion is called with nil argument. If setTags fails completion is called with error. + */ +- (void)setTags:(NSDictionary *)tags withCompletion:(void (^)(NSError *error))completion; + +/** + Get tags from the server. Calls delegate method `onTagsReceived:` or `onTagsFailedToReceive:` depending on the results. + */ +- (void)loadTags; + +/** + Get tags from server. Calls delegate method if exists and handler (block). + + @param successHandler The block is executed on the successful completion of the request. This block has no return value and takes one argument: the dictionary representation of the recieved tags. + Example of the dictionary representation of the received tags: + + { + Country = ru; + Language = ru; + } + + @param errorHandler The block is executed on the unsuccessful completion of the request. This block has no return value and takes one argument: the error that occurred during the request. + */ +- (void)loadTags:(PushwooshGetTagsHandler)successHandler error:(PushwooshErrorHandler)errorHandler; + +/** + Informs the Pushwoosh about the app being launched. Usually called internally by SDK Runtime. + */ +- (void)sendAppOpen; + +/** + Sends current badge value to server. Called internally by SDK Runtime when `UIApplication` `setApplicationBadgeNumber:` is set. This function is used for "auto-incremeting" badges to work. + This way Pushwoosh server can know what current badge value is set for the application. + + @param badge Current badge value. + */ +- (void)sendBadges:(NSInteger)badge; + +/** + Sends in-app purchases to Pushwoosh. Use in paymentQueue:updatedTransactions: payment queue method (see example). + + Example: + + - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { + [[PushNotificationManager pushManager] sendSKPaymentTransactions:transactions]; + } + + @param transactions Array of SKPaymentTransaction items as received in the payment queue. + */ +- (void)sendSKPaymentTransactions:(NSArray *)transactions; + +/** + Tracks individual in-app purchase. See recommended `sendSKPaymentTransactions:` method. + + @param productIdentifier purchased product ID + @param price price for the product + @param currencyCode currency of the price (ex: @"USD") + @param date time of the purchase (ex: [NSDate now]) + */ +- (void)sendPurchase:(NSString *)productIdentifier withPrice:(NSDecimalNumber *)price currencyCode:(NSString *)currencyCode andDate:(NSDate *)date; + +/** + Gets current push token. + + @return Current push token. May be nil if no push token is available yet. + */ +- (NSString *)getPushToken; + +/** + Gets HWID. Unique device identifier that used in all API calls with Pushwoosh. + This is identifierForVendor for iOS >= 7. + + @return Unique device identifier. + */ +- (NSString *)getHWID; + +- (void)handlePushRegistration:(NSData *)devToken; +- (void)handlePushRegistrationString:(NSString *)deviceID; + +//internal +- (void)handlePushRegistrationFailure:(NSError *)error; + +//if the push is received while the app is running. internal +- (BOOL)handlePushReceived:(NSDictionary *)userInfo; + +/** + Gets APN payload from push notifications dictionary. + + Example: + + - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { + NSDictionary * apnPayload = [[PushNotificationsManager pushManager] getApnPayload:pushNotification]; + NSLog(@"%@", apnPayload); + } + + For Push dictionary sample: + + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } + + Result is: + + { + alert = "Some text."; + sound = default; + }; + + @param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:` + */ +- (NSDictionary *)getApnPayload:(NSDictionary *)pushNotification; + +/** + Gets custom JSON string data from push notifications dictionary as specified in Pushwoosh Control Panel. + + Example: + + - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { + NSString * customData = [[PushNotificationsManager pushManager] getCustomPushData:pushNotification]; + NSLog(@"%@", customData); + } + + @param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:` + */ +- (NSString *)getCustomPushData:(NSDictionary *)pushNotification; + +/** + The same as getCustomPushData but returns NSDictionary rather than JSON string (converts JSON string into NSDictionary). + */ +- (NSDictionary *)getCustomPushDataAsNSDict:(NSDictionary *)pushNotification; + +/** + Returns dictionary with enabled remove notificaton types. + Example enabled push: + { + enabled = 1; + pushAlert = 1; + pushBadge = 1; + pushSound = 1; + type = 7; + } + + where "type" field is UIUserNotificationType + + Disabled push: + { + enabled = 1; + pushAlert = 0; + pushBadge = 0; + pushSound = 0; + type = 0; + } + + Note: In the latter example "enabled" field means that device can receive push notification but could not display alerts (ex: silent push) + */ ++ (NSMutableDictionary *)getRemoteNotificationStatus; + +/** + Clears the notifications from the notification center. + */ ++ (void)clearNotificationCenter; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + + Deprecated. Use PWInAppManager setUserId method instead + */ +- (void)setUserId:(NSString *)userId __attribute__ ((deprecated));; + +/** + Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed. + + @param oldUserId source user + @param newUserId destination user + @param doMerge if false all events for oldUserId are removed, if true all events for oldUserId are moved to newUserId + @param completion callback + + Deprecated. Use PWInAppManager mergeUserId method instead + */ +- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion __attribute__ ((deprecated)); + +/** + Post events for In-App Messages. This can trigger In-App message display as specified in Pushwoosh Control Panel. + + Example: + + [[PushNotificationManager pushManager] setUserId:@"96da2f590cd7246bbde0051047b0d6f7"]; + [[PushNotificationManager pushManager] postEvent:@"buttonPressed" withAttributes:@{ @"buttonNumber" : @"4", @"buttonLabel" : @"Banner" } completion:nil]; + + @param event name of the event + @param attributes NSDictionary of event attributes + @param completion function to call after posting event + + Deprecated. Use PWInAppManager postEvent method instead + */ +- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes completion:(void (^)(NSError *error))completion __attribute__ ((deprecated)); + +/** + See `postEvent:withAttributes:completion:` + + Deprecated. Use PWInAppManager postEvent method instead + */ +- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes __attribute__ ((deprecated)); + +@end diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/Pushwoosh.h b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/Pushwoosh.h new file mode 100644 index 0000000000..66eacf2cea --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Headers/Pushwoosh.h @@ -0,0 +1,8 @@ +// +// Pushwoosh.h +// Pushwoosh SDK +// (c) Pushwoosh 2016 +// + +#import "PushNotificationManager.h" +#import "PWInAppManager.h" diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Info.plist b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Info.plist Binary files differnew file mode 100644 index 0000000000..377172d284 --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Info.plist diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Modules/module.modulemap b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Modules/module.modulemap new file mode 100644 index 0000000000..a31d09abdb --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Pushwoosh { + umbrella header "Pushwoosh.h" + + export * + module * { export * } +} diff --git a/iphone/Maps/3party/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/PushNotificationManager.h index da57ffe4ad..6678f52cfe 100755..100644 --- a/iphone/Maps/3party/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/PushNotificationManager.h @@ -7,6 +7,10 @@ #import <Foundation/Foundation.h> #import <UIKit/UIKit.h> #import <StoreKit/StoreKit.h> +#import <UserNotifications/UserNotifications.h> + +#define PUSHWOOSH_VERSION @"5.0.2" + @class PushNotificationManager; @class CLLocation; @@ -57,13 +61,13 @@ typedef void (^PushwooshErrorHandler)(NSError *error); The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull. Push dictionary sample: - { - aps = { - alert = "Some text."; - sound = default; - }; - p = 1pb; - } + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } */ - (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification; @@ -76,13 +80,13 @@ typedef void (^PushwooshErrorHandler)(NSError *error); The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull. Push dictionary sample: - { - aps = { - alert = "Some text."; - sound = default; - }; - p = 1pb; - } + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } @param onStart If the application was not active when the push notification was received, the application will be launched with this parameter equal to `YES`, otherwise the parameter will be `NO`. */ @@ -94,10 +98,10 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @param tags Dictionary representation of received tags. Dictionary example: - { - Country = ru; - Language = ru; - } + { + Country = ru; + Language = ru; + } */ - (void)onTagsReceived:(NSDictionary *)tags; @@ -126,7 +130,7 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @end /** - `PWTags` class encapsulates the methods for creating tags parameters for sending them to the server. + `PWTags` class encapsulates the methods for creating tags parameters for sending them to the server. */ @interface PWTags : NSObject @@ -136,11 +140,11 @@ typedef void (^PushwooshErrorHandler)(NSError *error); Example: NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys: - aliasField.text, @"Alias", - [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", - [PWTags incrementalTagWithInteger:5], @"price", - nil]; - + aliasField.text, @"Alias", + [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", + [PWTags incrementalTagWithInteger:5], @"price", + nil]; + [[PushNotificationManager pushManager] setTags:tags]; @param delta Difference that needs to be applied to the tag's counter. @@ -152,7 +156,7 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @end /** - `PushNotificationManager` class offers access to the singletone-instance of the push manager responsible for registering the device with the APS servers, receiving and processing push notifications. + `PushNotificationManager` class offers access to the singletone-instance of the push manager responsible for registering the device with the APS servers, receiving and processing push notifications. */ @interface PushNotificationManager : NSObject { } @@ -184,8 +188,13 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @property (nonatomic, copy, readonly) NSDictionary *launchNotification; /** + Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10 + */ +@property (nonatomic, strong, readonly) id<UNUserNotificationCenterDelegate> notificationCenterDelegate; + +/** Initializes PushNotificationManager. Usually called by Pushwoosh Runtime internally. - @param appcCode Pushwoosh App ID. + @param appCode Pushwoosh App ID. @param appName Application name. */ + (void)initializeWithAppCode:(NSString *)appCode appName:(NSString *)appName; @@ -228,20 +237,19 @@ typedef void (^PushwooshErrorHandler)(NSError *error); */ - (void)stopLocationTracking; - /** Send tags to server. Tag names have to be created in the Pushwoosh Control Panel. Possible tag types: Integer, String, Incremental (integer only), List tags (array of values). Example: - NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys: - aliasField.text, @"Alias", - [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", - [PWTags incrementalTagWithInteger:5], @"price", - [NSArray arrayWithObjects:@"Item1", @"Item2", @"Item3", nil], @"List", - nil]; + NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys: + aliasField.text, @"Alias", + [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber", + [PWTags incrementalTagWithInteger:5], @"price", + [NSArray arrayWithObjects:@"Item1", @"Item2", @"Item3", nil], @"List", + nil]; - [[PushNotificationManager pushManager] setTags:tags]; + [[PushNotificationManager pushManager] setTags:tags]; @param tags Dictionary representation of tags to send. */ @@ -263,10 +271,10 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @param successHandler The block is executed on the successful completion of the request. This block has no return value and takes one argument: the dictionary representation of the recieved tags. Example of the dictionary representation of the received tags: - { - Country = ru; - Language = ru; - } + { + Country = ru; + Language = ru; + } @param errorHandler The block is executed on the unsuccessful completion of the request. This block has no return value and takes one argument: the error that occurred during the request. */ @@ -290,9 +298,9 @@ typedef void (^PushwooshErrorHandler)(NSError *error); Example: - - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { - [[PushNotificationManager pushManager] sendSKPaymentTransactions:transactions]; - } + - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { + [[PushNotificationManager pushManager] sendSKPaymentTransactions:transactions]; + } @param transactions Array of SKPaymentTransaction items as received in the payment queue. */ @@ -337,28 +345,28 @@ typedef void (^PushwooshErrorHandler)(NSError *error); Example: - - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { - NSDictionary * apnPayload = [[PushNotificationsManager pushManager] getApnPayload:pushNotification]; - NSLog(@"%@", apnPayload); - } - + - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { + NSDictionary * apnPayload = [[PushNotificationsManager pushManager] getApnPayload:pushNotification]; + NSLog(@"%@", apnPayload); + } + For Push dictionary sample: - { - aps = { - alert = "Some text."; - sound = default; - }; - p = 1pb; - } - + { + aps = { + alert = "Some text."; + sound = default; + }; + p = 1pb; + } + Result is: - { - alert = "Some text."; - sound = default; - }; - + { + alert = "Some text."; + sound = default; + }; + @param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:` */ - (NSDictionary *)getApnPayload:(NSDictionary *)pushNotification; @@ -368,10 +376,10 @@ typedef void (^PushwooshErrorHandler)(NSError *error); Example: - - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { - NSString * customData = [[PushNotificationsManager pushManager] getCustomPushData:pushNotification]; - NSLog(@"%@", customData); - } + - (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart { + NSString * customData = [[PushNotificationsManager pushManager] getCustomPushData:pushNotification]; + NSLog(@"%@", customData); + } @param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:` */ @@ -425,7 +433,7 @@ typedef void (^PushwooshErrorHandler)(NSError *error); @param oldUserId source user @param newUserId destination user @param doMerge if false all events for oldUserId are removed, if true all events for oldUserId are moved to newUserId - @param completeion callback + @param completion callback */ - (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion; @@ -434,9 +442,9 @@ typedef void (^PushwooshErrorHandler)(NSError *error); Example: - [[PushNotificationManager pushManager] setUserId:@"96da2f590cd7246bbde0051047b0d6f7"]; - [[PushNotificationManager pushManager] postEvent:@"buttonPressed" withAttributes:@{ @"buttonNumber" : @"4", @"buttonLabel" : @"Banner" } completion:nil]; - + [[PushNotificationManager pushManager] setUserId:@"96da2f590cd7246bbde0051047b0d6f7"]; + [[PushNotificationManager pushManager] postEvent:@"buttonPressed" withAttributes:@{ @"buttonNumber" : @"4", @"buttonLabel" : @"Banner" } completion:nil]; + @param event name of the event @param attributes NSDictionary of event attributes @param completion function to call after posting event diff --git a/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Pushwoosh b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Pushwoosh Binary files differnew file mode 100755 index 0000000000..c10fac1363 --- /dev/null +++ b/iphone/Maps/3party/Carthage/Build/iOS/Pushwoosh.framework/Pushwoosh diff --git a/iphone/Maps/3party/Pushwoosh.framework/Headers b/iphone/Maps/3party/Pushwoosh.framework/Headers deleted file mode 120000 index a177d2a6b9..0000000000 --- a/iphone/Maps/3party/Pushwoosh.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers
\ No newline at end of file diff --git a/iphone/Maps/3party/Pushwoosh.framework/Pushwoosh b/iphone/Maps/3party/Pushwoosh.framework/Pushwoosh deleted file mode 120000 index b002d72473..0000000000 --- a/iphone/Maps/3party/Pushwoosh.framework/Pushwoosh +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Pushwoosh
\ No newline at end of file diff --git a/iphone/Maps/3party/Pushwoosh.framework/Versions/A/Pushwoosh b/iphone/Maps/3party/Pushwoosh.framework/Versions/A/Pushwoosh Binary files differdeleted file mode 100755 index 740a192ee4..0000000000 --- a/iphone/Maps/3party/Pushwoosh.framework/Versions/A/Pushwoosh +++ /dev/null diff --git a/iphone/Maps/3party/Pushwoosh.framework/Versions/Current b/iphone/Maps/3party/Pushwoosh.framework/Versions/Current deleted file mode 120000 index 8c7e5a667f..0000000000 --- a/iphone/Maps/3party/Pushwoosh.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2460eec8c5..b3db61ffc3 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -36,9 +36,6 @@ 3404750E1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */; }; 3404750F1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */; }; 340475101E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */; }; - 340475111E08199E00C92850 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EF1E08199D00C92850 /* Pushwoosh.framework */; }; - 340475121E08199E00C92850 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EF1E08199D00C92850 /* Pushwoosh.framework */; }; - 340475131E08199E00C92850 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EF1E08199D00C92850 /* Pushwoosh.framework */; }; 340475491E081A4600C92850 /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475161E081A4600C92850 /* AppInfo.mm */; }; 3404754A1E081A4600C92850 /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475161E081A4600C92850 /* AppInfo.mm */; }; 3404754B1E081A4600C92850 /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475161E081A4600C92850 /* AppInfo.mm */; }; @@ -99,14 +96,6 @@ 3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */; }; 340837131B7243CE00B5C185 /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; }; 340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; - 340D94371E643AA700CB037A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; }; - 340D94381E643AA700CB037A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 340D94391E643AA700CB037A /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; }; - 340D943A1E643AA700CB037A /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 340D943C1E643ADE00CB037A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; }; - 340D943D1E643ADE00CB037A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 340D943E1E643ADE00CB037A /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; }; - 340D943F1E643ADE00CB037A /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 340E1EEB1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; }; 340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; }; 340E1EED1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; }; @@ -156,6 +145,9 @@ 343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; }; 343E75991E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; }; 3446C6771DDCA9A200146687 /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3446C6761DDCA9A200146687 /* libtraffic.a */; }; + 344D63171E795A2D006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; }; + 344D63181E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; }; + 344D63191E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; }; 3454D7B81E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; }; 3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; }; 3454D7BA1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; }; @@ -434,6 +426,15 @@ 34D4FA661E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; }; 34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; }; 34D4FA681E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; }; + 34D8087B1E793606002F0584 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087A1E793606002F0584 /* Alamofire.framework */; }; + 34D8087D1E79360D002F0584 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087C1E79360D002F0584 /* AlamofireImage.framework */; }; + 34D8087E1E79361A002F0584 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087C1E79360D002F0584 /* AlamofireImage.framework */; }; + 34D8087F1E79361B002F0584 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087C1E79360D002F0584 /* AlamofireImage.framework */; }; + 34D808801E79361E002F0584 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087A1E793606002F0584 /* Alamofire.framework */; }; + 34D808811E79361E002F0584 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087A1E793606002F0584 /* Alamofire.framework */; }; + 34D808861E793F91002F0584 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D808851E793F91002F0584 /* Pushwoosh.framework */; }; + 34D808871E793FA3002F0584 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D808851E793F91002F0584 /* Pushwoosh.framework */; }; + 34D808881E793FA4002F0584 /* Pushwoosh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D808851E793F91002F0584 /* Pushwoosh.framework */; }; 34ED298A1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; }; 34ED298B1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; }; 34ED298C1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; }; @@ -849,10 +850,6 @@ F6664C151E645A4100E703C2 /* MWMPPReviewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664C111E645A4100E703C2 /* MWMPPReviewCell.xib */; }; F6664C161E645A4100E703C2 /* MWMPPReviewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664C111E645A4100E703C2 /* MWMPPReviewCell.xib */; }; F6664C171E645A4100E703C2 /* MWMPPReviewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664C111E645A4100E703C2 /* MWMPPReviewCell.xib */; }; - F6664C181E6576B800E703C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; }; - F6664C191E6576B800E703C2 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4871E64356300164F91 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F6664C1A1E6576B800E703C2 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; }; - F6664C1B1E6576B800E703C2 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34DBA4881E64356300164F91 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F6791B131C43DEA7007A8A6E /* MWMStartButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */; }; F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */; }; F67E751E1DB76DFC00D6741F /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */; }; @@ -1391,8 +1388,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 340D94381E643AA700CB037A /* Alamofire.framework in Embed Frameworks */, - 340D943A1E643AA700CB037A /* AlamofireImage.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1403,8 +1398,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 340D943D1E643ADE00CB037A /* Alamofire.framework in Embed Frameworks */, - 340D943F1E643ADE00CB037A /* AlamofireImage.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1415,8 +1408,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - F6664C191E6576B800E703C2 /* Alamofire.framework in Embed Frameworks */, - F6664C1B1E6576B800E703C2 /* AlamofireImage.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1471,7 +1462,6 @@ 340474EC1E08199D00C92850 /* MWMMyTargetDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMyTargetDelegate.h; sourceTree = "<group>"; }; 340474ED1E08199D00C92850 /* MyTargetSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MyTargetSDK.framework; sourceTree = "<group>"; }; 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MyTrackerSDK.framework; sourceTree = "<group>"; }; - 340474EF1E08199D00C92850 /* Pushwoosh.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Pushwoosh.framework; sourceTree = "<group>"; }; 340475151E081A4600C92850 /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = "<group>"; }; 340475161E081A4600C92850 /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppInfo.mm; sourceTree = "<group>"; }; 340475181E081A4600C92850 /* MWMKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboard.h; sourceTree = "<group>"; }; @@ -1551,6 +1541,7 @@ 343E75951E5B1EE20041226A /* MWMCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCollectionViewController.h; sourceTree = "<group>"; }; 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCollectionViewController.mm; sourceTree = "<group>"; }; 3446C6761DDCA9A200146687 /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = "<group>"; }; + 344D63161E795A2D006F17CB /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 345050211E028B8000A8DC59 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; }; 3454D7991E07F045004AF2AD /* CALayer+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+RuntimeAttributes.h"; sourceTree = "<group>"; }; 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CALayer+RuntimeAttributes.mm"; sourceTree = "<group>"; }; @@ -1728,8 +1719,9 @@ 34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Init.swift"; sourceTree = "<group>"; }; 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstLaunchController.swift; sourceTree = "<group>"; }; 34D4FA651E265749003F53EF /* WhatsNewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatsNewController.swift; sourceTree = "<group>"; }; - 34DBA4871E64356300164F91 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; }; - 34DBA4881E64356300164F91 /* AlamofireImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlamofireImage.framework; sourceTree = "<group>"; }; + 34D8087A1E793606002F0584 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; }; + 34D8087C1E79360D002F0584 /* AlamofireImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AlamofireImage.framework; path = Carthage/Build/iOS/AlamofireImage.framework; sourceTree = "<group>"; }; + 34D808851E793F91002F0584 /* Pushwoosh.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Pushwoosh.framework; path = Carthage/Build/iOS/Pushwoosh.framework; sourceTree = "<group>"; }; 34ED29891E3BB9B40054D003 /* RoutePoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoutePoint.swift; sourceTree = "<group>"; }; 34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Hierarchy.swift"; sourceTree = "<group>"; }; 34F5E0D61E3F334700B1C415 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = "<group>"; }; @@ -2267,19 +2259,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 344D63171E795A2D006F17CB /* SystemConfiguration.framework in Frameworks */, 67B78B4B1E422E2E0018E590 /* CoreSpotlight.framework in Frameworks */, 67B78B4D1E422E2E0018E590 /* CoreData.framework in Frameworks */, - 340475111E08199E00C92850 /* Pushwoosh.framework in Frameworks */, - 340D943C1E643ADE00CB037A /* Alamofire.framework in Frameworks */, 340474FC1E08199D00C92850 /* FBSDKShareKit.framework in Frameworks */, + 34D808801E79361E002F0584 /* Alamofire.framework in Frameworks */, 340474F91E08199D00C92850 /* FBSDKLoginKit.framework in Frameworks */, 67B78B491E422E2E0018E590 /* iAd.framework in Frameworks */, 3432E17C1E49B484008477E9 /* FBAudienceNetwork.framework in Frameworks */, + 34D808871E793FA3002F0584 /* Pushwoosh.framework in Frameworks */, 3404750B1E08199E00C92850 /* MyTargetSDK.framework in Frameworks */, - 340D943E1E643ADE00CB037A /* AlamofireImage.framework in Frameworks */, 340474F61E08199D00C92850 /* FBSDKCoreKit.framework in Frameworks */, 340474F01E08199D00C92850 /* Crashlytics.framework in Frameworks */, 34570A3B1B13222600E6D4FD /* libz.dylib in Frameworks */, + 34D8087E1E79361A002F0584 /* AlamofireImage.framework in Frameworks */, 340474FF1E08199D00C92850 /* libFlurry_7.8.2.a in Frameworks */, 67B78B4A1E422E2E0018E590 /* MessageUI.framework in Frameworks */, 3404750E1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */, @@ -2295,14 +2288,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 34D808861E793F91002F0584 /* Pushwoosh.framework in Frameworks */, + 34D8087B1E793606002F0584 /* Alamofire.framework in Frameworks */, + 34D8087D1E79360D002F0584 /* AlamofireImage.framework in Frameworks */, 67B78B551E42333C0018E590 /* AdSupport.framework in Frameworks */, 67B78B471E422E0A0018E590 /* MobileCoreServices.framework in Frameworks */, 67B78B451E422C970018E590 /* iAd.framework in Frameworks */, 67B78B431E422C620018E590 /* MessageUI.framework in Frameworks */, - 340D94371E643AA700CB037A /* Alamofire.framework in Frameworks */, 67B78B411E422C360018E590 /* CoreSpotlight.framework in Frameworks */, 67B78B3F1E422C110018E590 /* SafariServices.framework in Frameworks */, 67B78B3D1E422BF60018E590 /* CoreData.framework in Frameworks */, + 344D63181E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */, 3446C6771DDCA9A200146687 /* libtraffic.a in Frameworks */, 34201E0C1DC0E33100D24118 /* libtracking.a in Frameworks */, 341F09841C20138100F18AC5 /* libpugixml.a in Frameworks */, @@ -2318,7 +2314,6 @@ 6741AAC41BF356BA002C974C /* libfreetype.a in Frameworks */, 6741AAC51BF356BA002C974C /* libfribidi.a in Frameworks */, 340474F41E08199D00C92850 /* Fabric.framework in Frameworks */, - 340D94391E643AA700CB037A /* AlamofireImage.framework in Frameworks */, 6741AAC61BF356BA002C974C /* libgeometry.a in Frameworks */, 674A7E291C0DA576003D48E1 /* libsdf_image.a in Frameworks */, 6741AAC91BF356BA002C974C /* libindexer.a in Frameworks */, @@ -2339,7 +2334,6 @@ 6741AAD41BF356BA002C974C /* libsearch.a in Frameworks */, 6741AAD51BF356BA002C974C /* libstorage.a in Frameworks */, 6741AAD61BF356BA002C974C /* libsuccinct.a in Frameworks */, - 340475121E08199E00C92850 /* Pushwoosh.framework in Frameworks */, 6741AA361BF340DE002C974C /* libz.dylib in Frameworks */, 674A7E2B1C0DA57C003D48E1 /* libdrape_frontend.a in Frameworks */, 340474F71E08199D00C92850 /* FBSDKCoreKit.framework in Frameworks */, @@ -2356,17 +2350,18 @@ files = ( 67B78B511E422E300018E590 /* CoreSpotlight.framework in Frameworks */, 67B78B531E422E300018E590 /* CoreData.framework in Frameworks */, - 340475131E08199E00C92850 /* Pushwoosh.framework in Frameworks */, - F6664C181E6576B800E703C2 /* Alamofire.framework in Frameworks */, 340474FE1E08199D00C92850 /* FBSDKShareKit.framework in Frameworks */, + 34D808811E79361E002F0584 /* Alamofire.framework in Frameworks */, 340474FB1E08199D00C92850 /* FBSDKLoginKit.framework in Frameworks */, 67B78B4F1E422E300018E590 /* iAd.framework in Frameworks */, + 344D63191E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */, 3432E17E1E49B484008477E9 /* FBAudienceNetwork.framework in Frameworks */, + 34D808881E793FA4002F0584 /* Pushwoosh.framework in Frameworks */, 3404750D1E08199E00C92850 /* MyTargetSDK.framework in Frameworks */, - F6664C1A1E6576B800E703C2 /* AlamofireImage.framework in Frameworks */, 340474F81E08199D00C92850 /* FBSDKCoreKit.framework in Frameworks */, 340474F21E08199D00C92850 /* Crashlytics.framework in Frameworks */, 849CF7861DE842290024A8A5 /* libz.dylib in Frameworks */, + 34D8087F1E79361B002F0584 /* AlamofireImage.framework in Frameworks */, 340475011E08199D00C92850 /* libFlurry_7.8.2.a in Frameworks */, 67B78B501E422E300018E590 /* MessageUI.framework in Frameworks */, 340475101E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */, @@ -2508,8 +2503,9 @@ 340474DB1E08199D00C92850 /* 3party */ = { isa = PBXGroup; children = ( - 34DBA4871E64356300164F91 /* Alamofire.framework */, - 34DBA4881E64356300164F91 /* AlamofireImage.framework */, + 34D808851E793F91002F0584 /* Pushwoosh.framework */, + 34D8087C1E79360D002F0584 /* AlamofireImage.framework */, + 34D8087A1E793606002F0584 /* Alamofire.framework */, 3432E1771E49B3A2008477E9 /* Bolts.framework */, 340474DC1E08199D00C92850 /* Crashlytics.framework */, 340474DD1E08199D00C92850 /* Fabric.framework */, @@ -2520,7 +2516,6 @@ 340474E11E08199D00C92850 /* Flurry */, 340474E91E08199D00C92850 /* MyTarget */, 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */, - 340474EF1E08199D00C92850 /* Pushwoosh.framework */, ); path = 3party; sourceTree = "<group>"; @@ -2805,6 +2800,7 @@ 67B78B421E422C620018E590 /* MessageUI.framework */, 67B78B401E422C360018E590 /* CoreSpotlight.framework */, 67B78B3E1E422C110018E590 /* SafariServices.framework */, + 344D63161E795A2D006F17CB /* SystemConfiguration.framework */, 67B78B3C1E422BF60018E590 /* CoreData.framework */, 34570A3A1B13222600E6D4FD /* libz.dylib */, ); @@ -4049,6 +4045,7 @@ F6D434721AD2AB97007C7728 /* Embed App Extensions */, 34A62D4A1C9034D0007FDCB7 /* ShellScript */, 34DF99C31E5C6892005D79D7 /* Embed Frameworks */, + 34D808831E7939DF002F0584 /* ShellScript */, ); buildRules = ( ); @@ -4069,6 +4066,7 @@ 6741AA521BF340DE002C974C /* Embed App Extensions */, 34F7422E1E08328300AC1FD6 /* ShellScript */, 340D943B1E643AA700CB037A /* Embed Frameworks */, + 34D808821E79363A002F0584 /* ShellScript */, ); buildRules = ( ); @@ -4090,6 +4088,7 @@ 849CF79A1DE842290024A8A5 /* Embed App Extensions */, 849CF79B1DE842290024A8A5 /* ShellScript */, 34DF99CC1E5C689B005D79D7 /* Embed Frameworks */, + 34D808841E793A01002F0584 /* ShellScript */, ); buildRules = ( ); @@ -4718,6 +4717,54 @@ shellPath = /bin/sh; shellScript = "#!/bin/bash\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *adhoc* ]]; then\n LINE=`grep CRASHLYTICS_IOS_KEY ../../private.h`\n if [[ $LINE =~ \\\"(.*)\\\" ]]; then\n CRASHLYTICS_KEY=${BASH_REMATCH[1]}\n if [[ \"$CRASHLYTICS_KEY\" ]]; then\n bash \"./3party/Fabric.framework/run\" \"$CRASHLYTICS_KEY\"\n fi\n fi\nfi\n"; }; + 34D808821E79363A002F0584 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/3party/Carthage/Build/iOS/Alamofire.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/AlamofireImage.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/Pushwoosh.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; + 34D808831E7939DF002F0584 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/3party/Carthage/Build/iOS/Alamofire.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/AlamofireImage.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/Pushwoosh.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks\n"; + }; + 34D808841E793A01002F0584 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/3party/Carthage/Build/iOS/Alamofire.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/AlamofireImage.framework", + "$(SRCROOT)/3party/Carthage/Build/iOS/Pushwoosh.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; 34F7422E1E08328300AC1FD6 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -6014,6 +6061,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -6112,6 +6160,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -6208,6 +6257,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -6306,6 +6356,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -6403,6 +6454,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -6501,6 +6553,7 @@ "$(inherited)", "$(PROJECT_DIR)/3party", "$(PROJECT_DIR)/3party/MyTarget", + "$(PROJECT_DIR)/3party/Carthage/Build/iOS", ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; |