summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2017-07-12 17:53:29 -0700
committerJesse Bounds <jesse@rebounds.net>2017-07-12 17:53:29 -0700
commitb55c50e7a48a36ca71caa9afbbfcefcbad0ab92e (patch)
treec7dfcac1562e5ac0dc85b3a4238f1185caa2b319
parent637b2a45f6074244e8cc6cb351327f1bae63d684 (diff)
downloadqtlocation-mapboxgl-upstream/boundsj-intro-telem-as-lib.tar.gz
Add mapbox-events-ios as submoduleupstream/boundsj-intro-telem-as-lib
-rw-r--r--.gitmodules3
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj91
m---------platform/ios/vendor/mapbox-events-ios0
3 files changed, 40 insertions, 54 deletions
diff --git a/.gitmodules b/.gitmodules
index 72cbe56da7..f3701505fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
[submodule "mapbox-gl-js"]
path = mapbox-gl-js
url = https://github.com/mapbox/mapbox-gl-js.git
+[submodule "platform/ios/vendor/mapbox-events-ios"]
+ path = platform/ios/vendor/mapbox-events-ios
+ url = https://github.com/mapbox/mapbox-events-ios.git
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 7df9ffcb41..9e628ff860 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -144,6 +144,7 @@
400533011DB0862B0069F638 /* NSArray+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 400532FF1DB0862B0069F638 /* NSArray+MGLAdditions.h */; };
400533021DB0862B0069F638 /* NSArray+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */; };
400533031DB086490069F638 /* NSArray+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */; };
+ 401379941F16FA1C00567137 /* libMapboxMobileEventsStatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4013798F1F16FA0200567137 /* libMapboxMobileEventsStatic.a */; };
4018B1C71CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; };
4018B1C81CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; };
4018B1C91CDC288A00F666AF /* MGLAnnotationView_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */; };
@@ -185,7 +186,6 @@
40EDA1C21CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */; };
40F887701D7A1E58008ECB67 /* MGLShapeSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */; };
40F887711D7A1E59008ECB67 /* MGLShapeSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */; };
- 40FB43721EF9A10000EC5BC0 /* libMapboxMobileEventsStatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40FB436D1EF9A0B100EC5BC0 /* libMapboxMobileEventsStatic.a */; };
40FDA76B1CCAAA6800442548 /* MBXAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */; };
556660CA1E1BF3A900E2C41B /* MGLFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 556660C91E1BF3A900E2C41B /* MGLFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
556660D81E1D085500E2C41B /* MGLVersionNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 556660D71E1D085500E2C41B /* MGLVersionNumber.m */; };
@@ -456,41 +456,34 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 40FB436A1EF9A0B100EC5BC0 /* PBXContainerItemProxy */ = {
+ 4013798C1F16FA0200567137 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
+ containerPortal = 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 404807B91EA186D8008A6D50;
remoteInfo = MapboxMobileEvents;
};
- 40FB436C1EF9A0B100EC5BC0 /* PBXContainerItemProxy */ = {
+ 4013798E1F16FA0200567137 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
+ containerPortal = 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 408596531ED084C0003BD29D;
remoteInfo = MapboxMobileEventsStatic;
};
- 40FB436E1EF9A0B100EC5BC0 /* PBXContainerItemProxy */ = {
+ 401379901F16FA0200567137 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
+ containerPortal = 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 404807C21EA186D8008A6D50;
remoteInfo = MapboxMobileEventsTests;
};
- 40FB43701EF9A0B100EC5BC0 /* PBXContainerItemProxy */ = {
+ 401379921F16FA0200567137 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
+ containerPortal = 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4085966F1ED08FF7003BD29D;
remoteInfo = resources;
};
- 40FB43731EF9A32000EC5BC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 408596521ED084C0003BD29D;
- remoteInfo = MapboxMobileEventsStatic;
- };
DA25D5C71CCDA0C100607828 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = DA1DC9421CB6C1C2006E619F /* Project object */;
@@ -656,6 +649,7 @@
36F1153C1D46080700878E1A /* libmbgl-platform-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmbgl-platform-ios.a"; path = "build/Debug-iphoneos/libmbgl-platform-ios.a"; sourceTree = "<group>"; };
400532FF1DB0862B0069F638 /* NSArray+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+MGLAdditions.h"; sourceTree = "<group>"; };
400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSArray+MGLAdditions.mm"; sourceTree = "<group>"; };
+ 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapboxMobileEvents.xcodeproj; path = "vendor/mapbox-events-ios/MapboxMobileEvents.xcodeproj"; sourceTree = SOURCE_ROOT; };
4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationView_Private.h; sourceTree = "<group>"; };
4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAnnotationView.mm; sourceTree = "<group>"; };
4018B1C51CDC277F00F666AF /* MGLAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationView.h; sourceTree = "<group>"; };
@@ -683,7 +677,6 @@
40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationContainerView.h; sourceTree = "<group>"; };
40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLAnnotationContainerView.m; sourceTree = "<group>"; };
40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLShapeSource_Private.h; sourceTree = "<group>"; };
- 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapboxMobileEvents.xcodeproj; path = "vendor/mapbox-telemetry-ios/MapboxMobileMetrics/MapboxMobileEvents.xcodeproj"; sourceTree = SOURCE_ROOT; };
40FDA7691CCAAA6800442548 /* MBXAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXAnnotationView.h; sourceTree = "<group>"; };
40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXAnnotationView.m; sourceTree = "<group>"; };
554180411D2E97DE00012372 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -978,7 +971,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 40FB43721EF9A10000EC5BC0 /* libMapboxMobileEventsStatic.a in Frameworks */,
+ 401379941F16FA1C00567137 /* libMapboxMobileEventsStatic.a in Frameworks */,
DAABF73D1CBC59BB005B1825 /* libmbgl-core.a in Frameworks */,
DA27C24E1CBB3811000B0ECD /* GLKit.framework in Frameworks */,
);
@@ -1135,6 +1128,17 @@
name = Categories;
sourceTree = "<group>";
};
+ 401379861F16FA0200567137 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 4013798D1F16FA0200567137 /* MapboxMobileEvents.framework */,
+ 4013798F1F16FA0200567137 /* libMapboxMobileEventsStatic.a */,
+ 401379911F16FA0200567137 /* MapboxMobileEventsTests.xctest */,
+ 401379931F16FA0200567137 /* resources.bundle */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
402E9DE21CD3A56500FD4519 /* Playground */ = {
isa = PBXGroup;
children = (
@@ -1170,17 +1174,6 @@
name = Sources;
sourceTree = "<group>";
};
- 40FB43641EF9A0B100EC5BC0 /* Products */ = {
- isa = PBXGroup;
- children = (
- 40FB436B1EF9A0B100EC5BC0 /* MapboxMobileEvents.framework */,
- 40FB436D1EF9A0B100EC5BC0 /* libMapboxMobileEventsStatic.a */,
- 40FB436F1EF9A0B100EC5BC0 /* MapboxMobileEventsTests.xctest */,
- 40FB43711EF9A0B100EC5BC0 /* resources.bundle */,
- );
- name = Products;
- sourceTree = "<group>";
- };
DA1DC9411CB6C1C2006E619F = {
isa = PBXGroup;
children = (
@@ -1379,7 +1372,7 @@
DA88484A1CBAFB9800AB86E3 /* MGLMapView.mm */,
DA88487F1CBB033F00AB86E3 /* Fabric */,
DA8848881CBB036000AB86E3 /* SMCalloutView */,
- 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */,
+ 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */,
);
name = Kit;
path = src;
@@ -1923,7 +1916,6 @@
buildRules = (
);
dependencies = (
- 40FB43741EF9A32000EC5BC0 /* PBXTargetDependency */,
DA25D5C81CCDA0C100607828 /* PBXTargetDependency */,
);
name = dynamic;
@@ -2051,8 +2043,8 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = 40FB43641EF9A0B100EC5BC0 /* Products */;
- ProjectRef = 40FB43631EF9A0B100EC5BC0 /* MapboxMobileEvents.xcodeproj */;
+ ProductGroup = 401379861F16FA0200567137 /* Products */;
+ ProjectRef = 401379851F16FA0200567137 /* MapboxMobileEvents.xcodeproj */;
},
);
projectRoot = "";
@@ -2069,32 +2061,32 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 40FB436B1EF9A0B100EC5BC0 /* MapboxMobileEvents.framework */ = {
+ 4013798D1F16FA0200567137 /* MapboxMobileEvents.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = MapboxMobileEvents.framework;
- remoteRef = 40FB436A1EF9A0B100EC5BC0 /* PBXContainerItemProxy */;
+ remoteRef = 4013798C1F16FA0200567137 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 40FB436D1EF9A0B100EC5BC0 /* libMapboxMobileEventsStatic.a */ = {
+ 4013798F1F16FA0200567137 /* libMapboxMobileEventsStatic.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libMapboxMobileEventsStatic.a;
- remoteRef = 40FB436C1EF9A0B100EC5BC0 /* PBXContainerItemProxy */;
+ remoteRef = 4013798E1F16FA0200567137 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 40FB436F1EF9A0B100EC5BC0 /* MapboxMobileEventsTests.xctest */ = {
+ 401379911F16FA0200567137 /* MapboxMobileEventsTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = MapboxMobileEventsTests.xctest;
- remoteRef = 40FB436E1EF9A0B100EC5BC0 /* PBXContainerItemProxy */;
+ remoteRef = 401379901F16FA0200567137 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 40FB43711EF9A0B100EC5BC0 /* resources.bundle */ = {
+ 401379931F16FA0200567137 /* resources.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = resources.bundle;
- remoteRef = 40FB43701EF9A0B100EC5BC0 /* PBXContainerItemProxy */;
+ remoteRef = 401379921F16FA0200567137 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -2424,11 +2416,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 40FB43741EF9A32000EC5BC0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = MapboxMobileEventsStatic;
- targetProxy = 40FB43731EF9A32000EC5BC0 /* PBXContainerItemProxy */;
- };
DA25D5C81CCDA0C100607828 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DA25D5B81CCD9EDE00607828 /* settings */;
@@ -2803,6 +2790,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
HEADER_SEARCH_PATHS = (
+ "$(SRCROOT)/vendor/mapbox-events-ios",
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(polylabel_INCLUDE_DIRECTORIES)",
);
@@ -2819,10 +2807,7 @@
"$(geometry_cflags)",
"$(geojson_cflags)",
);
- OTHER_LDFLAGS = (
- "$(mbgl_core_LINK_LIBRARIES)",
- "-ObjC",
- );
+ OTHER_LDFLAGS = "$(mbgl_core_LINK_LIBRARIES)";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios;
PRODUCT_NAME = Mapbox;
SKIP_INSTALL = YES;
@@ -2843,6 +2828,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
HEADER_SEARCH_PATHS = (
+ "$(SRCROOT)/vendor/mapbox-events-ios",
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(polylabel_INCLUDE_DIRECTORIES)",
);
@@ -2859,10 +2845,7 @@
"$(geometry_cflags)",
"$(geojson_cflags)",
);
- OTHER_LDFLAGS = (
- "$(mbgl_core_LINK_LIBRARIES)",
- "-ObjC",
- );
+ OTHER_LDFLAGS = "$(mbgl_core_LINK_LIBRARIES)";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios;
PRODUCT_NAME = Mapbox;
SKIP_INSTALL = YES;
diff --git a/platform/ios/vendor/mapbox-events-ios b/platform/ios/vendor/mapbox-events-ios
new file mode 160000
+Subproject f45d1b282fad5f70380f766cbf9975299487124