diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-09-17 15:31:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 15:31:43 -0700 |
| commit | a938c3ef68af249bb3199bde2818436a0bff0952 (patch) | |
| tree | 5301a86ea2e9b0b46d2684334f36a97dfa99a521 /platform/ios/ios.xcodeproj/project.pbxproj | |
| parent | 153e97c8e7cd03cdd0e94cb5e17a2723f417d973 (diff) | |
| download | qtlocation-mapboxgl-a938c3ef68af249bb3199bde2818436a0bff0952.tar.gz | |
[ios, macos] Offline regions merge. (#12791)
* [ios, macos] Add offline regions merge.
* [ios, macos] Update changelogs.
* [ios, macos] Fix refreshing the offline packs after new content is added.
* [ios, macos] Update MGLOfflineStorage's add contents of file documentation.
* [ios, macos] Add MGLOfflineStorage test cases for adding file contents.
* [ios, macos] Add offline merge test database.
* [ios, macos] Add packs parameter to MGLBatchedOfflinePackAdditionCompletionHandler.
* [core] Fix a query mege duplication.
* [ios, macos] Remove unnecessary pack iteration.
* [ios, macos] Fix packs update KVO notifications.
* [ios, macos] Add localization strings.
* [core] Fix query readability.
* [ios, macos] Fix MGLOfflineStorageTest, cleanup the cache database after the test.
* [ios, macos] Fix offline packs, updating triggers a crash.
Diffstat (limited to 'platform/ios/ios.xcodeproj/project.pbxproj')
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 5c42d4aada..960fc4161b 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -33,6 +33,8 @@ 1F06668D1EC64F8E001C16D7 /* MGLLight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0666891EC64F8E001C16D7 /* MGLLight.mm */; }; 1F26B6C120E189C9007BCC21 /* MBXCustomLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F26B6C020E189C9007BCC21 /* MBXCustomLocationViewController.m */; }; 1F26B6C320E1A351007BCC21 /* simple_route.json in Resources */ = {isa = PBXBuildFile; fileRef = 1F26B6C220E1A351007BCC21 /* simple_route.json */; }; + 1F5627F62148387100038ED1 /* barcelona.db in Resources */ = {isa = PBXBuildFile; fileRef = 1F5627F52148387100038ED1 /* barcelona.db */; }; + 1F5627F72148387100038ED1 /* barcelona.db in Resources */ = {isa = PBXBuildFile; fileRef = 1F5627F52148387100038ED1 /* barcelona.db */; }; 1F7454921ECBB42C00021D39 /* MGLLight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0666891EC64F8E001C16D7 /* MGLLight.mm */; }; 1F7454931ECBB43F00021D39 /* MGLLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0666881EC64F8E001C16D7 /* MGLLight.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F7454961ECD450D00021D39 /* MGLLight_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F7454941ECD450D00021D39 /* MGLLight_Private.h */; }; @@ -782,6 +784,7 @@ 1F26B6BF20E189C9007BCC21 /* MBXCustomLocationViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXCustomLocationViewController.h; sourceTree = "<group>"; }; 1F26B6C020E189C9007BCC21 /* MBXCustomLocationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBXCustomLocationViewController.m; sourceTree = "<group>"; }; 1F26B6C220E1A351007BCC21 /* simple_route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = simple_route.json; sourceTree = "<group>"; }; + 1F5627F52148387100038ED1 /* barcelona.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = barcelona.db; path = ../../darwin/test/barcelona.db; sourceTree = "<group>"; }; 1F7454941ECD450D00021D39 /* MGLLight_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLight_Private.h; sourceTree = "<group>"; }; 1F7454A61ED08AB400021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLLightTest.mm; path = ../../darwin/test/MGLLightTest.mm; sourceTree = "<group>"; }; 1F95931C1E6DE2E900D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; }; @@ -1922,6 +1925,7 @@ DA2E88551CC036F400F24E7B /* Info.plist */, DA2784FB1DF02FF4001D5B8D /* Media.xcassets */, DA35D0871E1A6309007DED41 /* one-liner.json */, + 1F5627F52148387100038ED1 /* barcelona.db */, ); name = "SDK Tests"; path = test; @@ -2795,6 +2799,7 @@ buildActionMask = 2147483647; files = ( 16376B471FFDB92B0000563E /* one-liner.json in Resources */, + 1F5627F72148387100038ED1 /* barcelona.db in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2843,6 +2848,7 @@ DA2784FC1DF02FF4001D5B8D /* Media.xcassets in Resources */, 353BAEF71D646370009A8DA9 /* amsterdam.geojson in Resources */, DA35D0881E1A6309007DED41 /* one-liner.json in Resources */, + 1F5627F62148387100038ED1 /* barcelona.db in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; |