Merge branch 'feature/update-modulemap' into develop
# Conflicts: # ApplicationInsights.podspec # Support/ApplicationInsights.xcconfig # Support/module.modulemap
This commit is contained in:
Lukas Spieß
Коммит
2539c0edcd
|
|
@ -15,9 +15,8 @@ Pod::Spec.new do |s|
|
|||
s.platform = :ios, '6.0'
|
||||
s.requires_arc = true
|
||||
|
||||
s.frameworks = 'UIKit', 'Foundation', 'SystemConfiguration', 'Security'
|
||||
s.frameworks = 'UIKit', 'Foundation', 'SystemConfiguration', 'Security', 'CoreTelephony'
|
||||
s.libraries = 'z', 'c++'
|
||||
s.weak_framework = 'CoreTelephony'
|
||||
|
||||
s.ios.vendored_frameworks = 'ApplicationInsights/ApplicationInsights.framework'
|
||||
s.preserve_path = 'ApplicationInsights/README.md'
|
||||
|
|
|
|||
44
README.md
44
README.md
|
|
@ -84,28 +84,18 @@ From our experience, 3rd-party libraries usually reside inside a subdirectory (l
|
|||
2. Make sure the `Project Navigator` is visible (⌘+1)
|
||||
3. Drag & drop `ApplicationInsights.framework` from your window in the `Finder` into your project in Xcode and move it to the desired location in the `Project Navigator` (e.g. into the group called `Vendor`)
|
||||
4. A popup will appear. Select `Create groups for any added folders` and set the checkmark for your target. Then click `Finish`.
|
||||
5. Select your project in the `Project Navigator` (⌘+1).
|
||||
6. Select your app target.
|
||||
7. Select the tab `Build Phases`.
|
||||
8. Expand `Link Binary With Libraries`.
|
||||
9. Add the following system frameworks, if they are missing:
|
||||
- `UIKit`
|
||||
- `Foundation`
|
||||
- `SystemConfiguration`
|
||||
- `Security`
|
||||
- `libz`
|
||||
- `CoreTelephony`(only required if iOS > 7.0)
|
||||
9. Open the `Info.plist` of your app target and add a new field of type *String*. Name it `MSAIInstrumentationKey` and set your Application Insights instrumentation key from 4.1 as its value.
|
||||
5. Open the `Info.plist` of your app target and add a new field of type *String*. Name it `MSAIInstrumentationKey` and set your Application Insights instrumentation key from 4.1 as its value.
|
||||
|
||||
<a id="modifycode"/>
|
||||
### 4.5 Modify Code
|
||||
|
||||
**Objective-C**
|
||||
|
||||
1. Open your `AppDelegate.m` file.
|
||||
2. Add the following line at the top of the file below your own #import statements:
|
||||
2. Add the following line at the top of the file below your own `import` statements:
|
||||
|
||||
```objectivec
|
||||
#import <ApplicationInsights/ApplicationInsights.h>
|
||||
@import ApplicationInsights;
|
||||
```
|
||||
|
||||
3. Search for the method `application:didFinishLaunchingWithOptions:`
|
||||
|
|
@ -128,10 +118,10 @@ From our experience, 3rd-party libraries usually reside inside a subdirectory (l
|
|||
**Swift**
|
||||
|
||||
1. Open your `AppDelegate.swift` file.
|
||||
2. Add the following line at the top of the file below your own #import statements:
|
||||
2. Add the following line at the top of the file below your own import statements:
|
||||
|
||||
```swift
|
||||
#import ApplicationInsights
|
||||
@import ApplicationInsights;
|
||||
```
|
||||
|
||||
3. Search for the method
|
||||
|
|
@ -171,8 +161,26 @@ It is also possible to set the instrumentation key of your app in code. This wil
|
|||
[MSAIApplicationInsights start];
|
||||
```
|
||||
|
||||
<a id="linkmanually"/>
|
||||
### 5.2 Linking System Frameworks manually
|
||||
|
||||
### 5.2 Setup with CocoaPods
|
||||
If you are working with an older project which doesn't support clang modules yet or you for some reason turned off the `Enable Modules (C and Objective-C` and `Link Frameworks Automatically` options in Xcode, you have to manually link some system frameworks:
|
||||
|
||||
1. Select your project in the `Project Navigator` (⌘+1).
|
||||
2. Select your app target.
|
||||
3. Select the tab `Build Phases`.
|
||||
4. Expand `Link Binary With Libraries`.
|
||||
5. Add the following system frameworks, if they are missing:
|
||||
- `UIKit`
|
||||
- `Foundation`
|
||||
- `SystemConfiguration`
|
||||
- `Security`
|
||||
- `libz`
|
||||
- `CoreTelephony`
|
||||
|
||||
Note that this also means that you can't use the `@import` syntax mentioned in the [Modify Code](#modify) section but have to stick to the old `#import <ApplicationInsights/ApplicationInsights.h>`.
|
||||
|
||||
### 5.3 Setup with CocoaPods
|
||||
|
||||
[CocoaPods](http://cocoapods.org) is a dependency manager for Objective-C, which automates and simplifies the process of using 3rd-party libraries like ApplicationInsights in your projects. To learn how to setup CocoaPods for your project, visit the [official CocoaPods website](http://cocoapods.org/).
|
||||
|
||||
|
|
@ -187,7 +195,7 @@ platform :ios, '8.0'
|
|||
pod "ApplicationInsights", '1.0-beta.3'
|
||||
```
|
||||
|
||||
### 5.3 iOS 8 Extensions
|
||||
### 5.4 iOS 8 Extensions
|
||||
|
||||
The following points need to be considered to use the Application Insights SDK with iOS 8 Extensions:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
OTHER_LDFLAGS=$(inherited) -framework CFNetwork -framework Foundation -framework Security -framework SystemConfiguration -framework UIKit -weak_framework CoreTelephony -lz -lc++
|
||||
OTHER_LDFLAGS=$(inherited) -framework Foundation -framework Security -framework SystemConfiguration -framework UIKit -framework CoreTelephony -lz -lc++
|
||||
MSAI_DOCSET_NAME=ApplicationInsights
|
||||
GCC_PREPROCESSOR_DEFINITIONS=$(inherited) CONFIGURATION_$(CONFIGURATION)
|
||||
|
|
|
|||
|
|
@ -4,5 +4,11 @@ framework module ApplicationInsights {
|
|||
export *
|
||||
module * { export * }
|
||||
|
||||
link framework "CoreTelephony"
|
||||
link framework "Foundation"
|
||||
link framework "Security"
|
||||
link framework "SystemConfiguration"
|
||||
link framework "UIKit"
|
||||
link "z"
|
||||
link "c++"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,28 +84,18 @@ From our experience, 3rd-party libraries usually reside inside a subdirectory (l
|
|||
2. Make sure the `Project Navigator` is visible (⌘+1)
|
||||
3. Drag & drop `ApplicationInsights.framework` from your window in the `Finder` into your project in Xcode and move it to the desired location in the `Project Navigator` (e.g. into the group called `Vendor`)
|
||||
4. A popup will appear. Select `Create groups for any added folders` and set the checkmark for your target. Then click `Finish`.
|
||||
5. Select your project in the `Project Navigator` (⌘+1).
|
||||
6. Select your app target.
|
||||
7. Select the tab `Build Phases`.
|
||||
8. Expand `Link Binary With Libraries`.
|
||||
9. Add the following system frameworks, if they are missing:
|
||||
- `UIKit`
|
||||
- `Foundation`
|
||||
- `SystemConfiguration`
|
||||
- `Security`
|
||||
- `libz`
|
||||
- `CoreTelephony`(only required if iOS > 7.0)
|
||||
9. Open the `Info.plist` of your app target and add a new field of type *String*. Name it `MSAIInstrumentationKey` and set your Application Insights instrumentation key from 4.1 as its value.
|
||||
5. Open the `Info.plist` of your app target and add a new field of type *String*. Name it `MSAIInstrumentationKey` and set your Application Insights instrumentation key from 4.1 as its value.
|
||||
|
||||
<a id="modifycode"/>
|
||||
### 4.5 Modify Code
|
||||
|
||||
**Objective-C**
|
||||
|
||||
1. Open your `AppDelegate.m` file.
|
||||
2. Add the following line at the top of the file below your own #import statements:
|
||||
2. Add the following line at the top of the file below your own `import` statements:
|
||||
|
||||
```objectivec
|
||||
#import <ApplicationInsights/ApplicationInsights.h>
|
||||
@import ApplicationInsights;
|
||||
```
|
||||
|
||||
3. Search for the method `application:didFinishLaunchingWithOptions:`
|
||||
|
|
@ -128,10 +118,10 @@ From our experience, 3rd-party libraries usually reside inside a subdirectory (l
|
|||
**Swift**
|
||||
|
||||
1. Open your `AppDelegate.swift` file.
|
||||
2. Add the following line at the top of the file below your own #import statements:
|
||||
2. Add the following line at the top of the file below your own import statements:
|
||||
|
||||
```swift
|
||||
#import ApplicationInsights
|
||||
@import ApplicationInsights;
|
||||
```
|
||||
|
||||
3. Search for the method
|
||||
|
|
@ -171,8 +161,26 @@ It is also possible to set the instrumentation key of your app in code. This wil
|
|||
[MSAIApplicationInsights start];
|
||||
```
|
||||
|
||||
<a id="linkmanually"/>
|
||||
### 5.2 Linking System Frameworks manually
|
||||
|
||||
### 5.2 Setup with CocoaPods
|
||||
If you are working with an older project which doesn't support clang modules yet or you for some reason turned off the `Enable Modules (C and Objective-C` and `Link Frameworks Automatically` options in Xcode, you have to manually link some system frameworks:
|
||||
|
||||
1. Select your project in the `Project Navigator` (⌘+1).
|
||||
2. Select your app target.
|
||||
3. Select the tab `Build Phases`.
|
||||
4. Expand `Link Binary With Libraries`.
|
||||
5. Add the following system frameworks, if they are missing:
|
||||
- `UIKit`
|
||||
- `Foundation`
|
||||
- `SystemConfiguration`
|
||||
- `Security`
|
||||
- `libz`
|
||||
- `CoreTelephony`
|
||||
|
||||
Note that this also means that you can't use the `@import` syntax mentioned in the [Modify Code](#modify) section but have to stick to the old `#import <ApplicationInsights/ApplicationInsights.h>`.
|
||||
|
||||
### 5.3 Setup with CocoaPods
|
||||
|
||||
[CocoaPods](http://cocoapods.org) is a dependency manager for Objective-C, which automates and simplifies the process of using 3rd-party libraries like ApplicationInsights in your projects. To learn how to setup CocoaPods for your project, visit the [official CocoaPods website](http://cocoapods.org/).
|
||||
|
||||
|
|
@ -187,7 +195,7 @@ platform :ios, '8.0'
|
|||
pod "ApplicationInsights", '1.0-beta.3'
|
||||
```
|
||||
|
||||
### 5.3 iOS 8 Extensions
|
||||
### 5.4 iOS 8 Extensions
|
||||
|
||||
The following points need to be considered to use the Application Insights SDK with iOS 8 Extensions:
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче