Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Static framework should define module #85

Merged
merged 4 commits into from
Oct 30, 2018
Merged

Static framework should define module #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79d29f1
Static framework defines module
frederoni Oct 23, 2018
a67c322
Merge branch 'master' into fred/static-def-mod
rclee Oct 26, 2018
f54bb4e
Update namespace
rclee Oct 29, 2018
8ea7e0b
Update version to 0.7.0.beta
rclee Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MapboxMobileEvents.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

s.name = 'MapboxMobileEvents'
s.version = "0.6.0"
s.version = "0.7.0.beta"
s.summary = "Mapbox Mobile Events"

s.description = "Collects usage information to help Mapbox improve its products."
Expand Down Expand Up @@ -39,5 +39,6 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = 'MapboxMobileEvents'
s.library = 'z'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

end
2 changes: 2 additions & 0 deletions MapboxMobileEvents.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,7 @@
408596591ED084C0003BD29D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/vendor/TrustKit/TrustKit/**";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = "";
Expand All @@ -1173,6 +1174,7 @@
4085965A1ED084C0003BD29D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/vendor/TrustKit/TrustKit/**";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = "";
Expand Down
2 changes: 1 addition & 1 deletion MapboxMobileEvents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.6.0</string>
<string>0.7.0.beta</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
28 changes: 16 additions & 12 deletions MapboxMobileEvents/MMENamespacedDependencies.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
#define MMELocationManager __NS_SYMBOL(MMELocationManager)
#endif

#ifndef MMEMetrics
#define MMEMetrics __NS_SYMBOL(MMEMetrics)
#endif

#ifndef MMEMetricsManager
#define MMEMetricsManager __NS_SYMBOL(MMEMetricsManager)
#endif
Expand Down Expand Up @@ -413,6 +417,10 @@
#define MMEDebugEventTypeLocationManager __NS_SYMBOL(MMEDebugEventTypeLocationManager)
#endif

#ifndef MMEDebugEventTypeTelemetryMetrics
#define MMEDebugEventTypeTelemetryMetrics __NS_SYMBOL(MMEDebugEventTypeTelemetryMetrics)
#endif

#ifndef MMEEventTypeAppUserTurnstile
#define MMEEventTypeAppUserTurnstile __NS_SYMBOL(MMEEventTypeAppUserTurnstile)
#endif
Expand Down Expand Up @@ -553,10 +561,18 @@
#define MMEEventKeyModel __NS_SYMBOL(MMEEventKeyModel)
#endif

#ifndef MMELocationManagerDistanceFilter
#define MMELocationManagerDistanceFilter __NS_SYMBOL(MMELocationManagerDistanceFilter)
#endif

#ifndef MMEEventKeyDevice
#define MMEEventKeyDevice __NS_SYMBOL(MMEEventKeyDevice)
#endif

#ifndef MMERadiusAccuracyMax
#define MMERadiusAccuracyMax __NS_SYMBOL(MMERadiusAccuracyMax)
#endif

#ifndef MMEEventKeyEnabledTelemetry
#define MMEEventKeyEnabledTelemetry __NS_SYMBOL(MMEEventKeyEnabledTelemetry)
#endif
Expand All @@ -569,10 +585,6 @@
#define MMEEventKeyResolution __NS_SYMBOL(MMEEventKeyResolution)
#endif

#ifndef kMMEReachabilityChangedNotification
#define kMMEReachabilityChangedNotification __NS_SYMBOL(kMMEReachabilityChangedNotification)
#endif

#ifndef MMEEventKeyAccessibilityFontScale
#define MMEEventKeyAccessibilityFontScale __NS_SYMBOL(MMEEventKeyAccessibilityFontScale)
#endif
Expand Down Expand Up @@ -721,18 +733,10 @@
#define MMEEventTypeSearchSelected __NS_SYMBOL(MMEEventTypeSearchSelected)
#endif

#ifndef MMELocationManagerDistanceFilter
#define MMELocationManagerDistanceFilter __NS_SYMBOL(MMELocationManagerDistanceFilter)
#endif

#ifndef MMEEventTypeSearchFeedback
#define MMEEventTypeSearchFeedback __NS_SYMBOL(MMEEventTypeSearchFeedback)
#endif

#ifndef MMERadiusAccuracyMax
#define MMERadiusAccuracyMax __NS_SYMBOL(MMERadiusAccuracyMax)
#endif

#ifndef MMEEventSource
#define MMEEventSource __NS_SYMBOL(MMEEventSource)
#endif
Expand Down
2 changes: 1 addition & 1 deletion resources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.0</string>
<string>0.7.0.beta</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
Expand Down