Merge branch 'master' into dev
# Conflicts: # Lighting.xcodeproj/project.pbxproj # Lighting/Class/Experiencecentre/Controller/ShoppingBagViewController.m # Podfile.lock # Pods/JCore/libjcore-ios-1.1.5.a # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig # Pods/Target Support Files/Pods-Lighting_base-Lighting/Pods-Lighting_base-Lighting.debug.xcconfig # Pods/Target Support Files/Pods-Lighting_base-LightingDev/Pods-Lighting_base-LightingDev.release.xcconfig # fastlane/Fastfile # podfile
Showing
This diff is collapsed.
10.3 KB
File added
File added
Pods/Manifest.lock
100644 → 100755
Pods/Pods.xcodeproj/project.pbxproj
100644 → 100755
This diff is collapsed.
File moved
File moved
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File added
fastlane/iPA/Lighting.ipa
0 → 100644
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
platform:ios,'9.0' | platform:ios,'9.0' | ||
use_frameworks! | |||
target 'Lighting' do | |||
abstract_target 'Lighting_base' do | |||
pod 'WYPopoverController', '~> 0.3.9' | pod 'WYPopoverController', '~> 0.3.9' | ||
pod 'FDFullscreenPopGesture' | pod 'FDFullscreenPopGesture' | ||
pod 'MWPhotoBrowser', '~> 2.1.2' | pod 'MWPhotoBrowser', '~> 2.1.2' | ||
... | @@ -27,6 +25,13 @@ target 'Lighting' do | ... | @@ -27,6 +25,13 @@ target 'Lighting' do |
pod 'iCarousel', '~> 1.8.3' | pod 'iCarousel', '~> 1.8.3' | ||
pod 'UMengAnalytics' | pod 'UMengAnalytics' | ||
pod 'Bugly', '~> 2.4.7' | pod 'Bugly', '~> 2.4.7' | ||
pod 'YXKit’, ‘~> 0.0.2’ | |||
target 'Lighting' do | |||
end | |||
target 'LightingDev' do | |||
end | |||
target 'LightingDis' do | |||
end | |||
end | end |