Merge branch 'feature/IOS-74-apps-flyer' into develop
# Conflicts: # 1Weather/Model/Settings/Settings.swift # Podfile.lock # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
Showing
... | @@ -15,6 +15,7 @@ target '1Weather' do | ... | @@ -15,6 +15,7 @@ target '1Weather' do |
pod 'AlgoliaSearchClient', '~> 8.2' | pod 'AlgoliaSearchClient', '~> 8.2' | ||
pod 'Flurry-iOS-SDK/FlurrySDK' | pod 'Flurry-iOS-SDK/FlurrySDK' | ||
pod 'MoEngage-iOS-SDK' | pod 'MoEngage-iOS-SDK' | ||
pod 'AppsFlyerFramework' | |||
# If updating the podspec, make sure to add a tag and push it to origin | # If updating the podspec, make sure to add a tag and push it to origin | ||
pod 'Swarm', :git => 'git@gitlab.pinsightmedia.com:oneweather/wdt-skywisetilekit-ios.git', :branch => 'develop' | pod 'Swarm', :git => 'git@gitlab.pinsightmedia.com:oneweather/wdt-skywisetilekit-ios.git', :branch => 'develop' | ||
... | ... |
File added
This diff is collapsed.
Click to expand it.
File added
File added
This diff is collapsed.
Click to expand it.
File added
File added
File added
File added
File added
This diff is collapsed.
Click to expand it.
File added
This diff is collapsed.
Click to expand it.
File added
This diff is collapsed.
Click to expand it.
File added
File added
This diff is collapsed.
Click to expand it.
File added
File added
File added
File added
Pods/AppsFlyerFramework/LICENSE
0 → 100644
This diff is collapsed.
Click to expand it.
Pods/AppsFlyerFramework/README.md
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment