Merge branch 'feature/radar'
# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/AppDelegate.swift # 1Weather/Model/Settings.swift # 1Weather/Resources/en.lproj/Localizable.strings # Podfile.lock # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Pods.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
Showing
No preview for this file type
This diff is collapsed.
Click to expand it.
1Weather/Coordinators/RadarCoordinator.swift
0 → 100644
1Weather/Extensions/CACornerMask+All.swift
0 → 100644
1Weather/Model/RadarLayers/RadarLayer.swift
0 → 100644
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
1Weather/Storage/UserDefaultsWrapper.swift
0 → 100644
This diff is collapsed.
Click to expand it.
1Weather/ViewModels/RadarViewModel.swift
0 → 100644
... | ... | @@ -15,6 +15,9 @@ target '1Weather' do |
pod 'Flurry-iOS-SDK/FlurrySDK' | ||
pod 'MoEngage-iOS-SDK' | ||
# 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 'Firebase/Crashlytics' | ||
# Recommended: Add the Firebase pod for Google Analytics | ||
pod 'Firebase/Analytics' | ||
... | ... |
Pods/Local Podspecs/Swarm.podspec.json
0 → 100644
{ | ||
"name": "Swarm", | ||
"version": "1.0.7", | ||
"summary": "Swarm is a framework for 1Weather.", | ||
"description": "OneLouder internal pod which creates a Universal iOS framework for WDT Radar.", | ||
"homepage": "https://gitlab.pinsightmedia.com/oneweather/wdt-skywisetilekit-ios", | ||
"license": "Copyright © 2016 Weather Decision Technologies, Inc. All rights reserved.", | ||
"authors": "Justin Greenfield and Steve Pint", | ||
"platforms": { | ||
"ios": "10.0" | ||
}, | ||
"source": { | ||
"git": "https://gitlab.pinsightmedia.com/oneweather/wdt-skywisetilekit-ios", | ||
"tag": "1.0.7" | ||
}, | ||
"source_files": "Swarm/**/*.{h,swift}", | ||
"resources": [ | ||
"Swarm/*.json", | ||
"Swarm/Info.plist" | ||
], | ||
"swift_versions": "4.2", | ||
"swift_version": "4.2" | ||
} |
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Pods/Swarm/Swarm/SupportFiles/Swarm.h
0 → 100644
Pods/Swarm/Swarm/SwarmAuthentication.swift
0 → 100644
Pods/Swarm/Swarm/SwarmHelpers.swift
0 → 100644
Pods/Swarm/Swarm/SwarmLoop.swift
0 → 100644
Pods/Swarm/Swarm/SwarmManager.swift
0 → 100644
Pods/Swarm/Swarm/SwarmOverlay.swift
0 → 100644
This diff is collapsed.
Click to expand it.
Pods/Swarm/Swarm/SwarmProducts.swift
0 → 100644
Pods/Swarm/Swarm/swarmAlertTypes.json
0 → 100644
Pods/Swarm/Swarm/swarmLayerGroups.json
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment