updating to 2.2.2 of the SDK to better support Swift modules

aerisweather · Dec 17, 2015 · b4fd996 · b4fd996
1 parent 6ec4216
commit b4fd996
Show file tree

Hide file tree

Showing 124 changed files with 234 additions and 413 deletions.
diff --git a/AerisWeatherSDK/Aeris.framework/Modules b/AerisWeatherSDK/Aeris.framework/Modules
@@ -0,0 +1 @@
+Versions/Current/Modules
diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Aeris b/AerisWeatherSDK/Aeris.framework/Versions/A/Aeris
diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFAdvisory.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFAdvisory.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
 #import <Aeris/AWFGeographicObject.h>
 
 @class AWFGeoPolygon;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFForecastModel.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFForecastModel.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 /**
  *  The model types currently supported.
  */

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGeoPolygon.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGeoPolygon.h
@@ -6,10 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <CoreLocation/CoreLocation.h>
 #import <MapKit/MapKit.h>
-
 #import <Aeris/CLLocation+Aeris.h>
 
 //#import "AWFCoordinateBounds.h"

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGeographicObjectLoader.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGeographicObjectLoader.h
@@ -7,7 +7,6 @@
 //
 
 #import <CoreLocation/CoreLocation.h>
-
 #import <Aeris/AWFObjectLoader.h>
 #import <Aeris/AWFGlobals.h>
 

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGlobals.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFGlobals.h
@@ -10,10 +10,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <CoreLocation/CoreLocation.h>
-
-#import "AWFWeatherDataType.h"
-#import "AWFMeasurement.h"
-#import "NSBundle+Aeris.h"
+#import <Aeris/AWFWeatherDataType.h>
+#import <Aeris/AWFMeasurement.h>
+#import <Aeris/NSBundle+Aeris.h>
 
 // Testing for specific iOS versions
 #define AWF_SYSTEM_VERSION_EQUAL_TO(v)                  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFLocationManager.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFLocationManager.h
@@ -6,9 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <CoreLocation/CoreLocation.h>
-#import <CoreGraphics/CoreGraphics.h>
+#import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSUInteger, AWFUserTrackingMode) {
 	AWFUserTrackingModeNone = 0,

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFLog.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFLog.h
@@ -19,11 +19,8 @@ typedef NS_ENUM(NSUInteger, AWFLogLevel) {
 @interface AWFLog : NSObject
 
 + (void)debug:(NSString *)format,...;
-
 + (void)info:(NSString *)format,...;
-
 + (void)warn:(NSString *)format,...;
-
 + (void)error:(NSString *)format,...;
 
 + (void)setLoggingLevel:(AWFLogLevel)level;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFMeasurement.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFMeasurement.h
@@ -6,6 +6,8 @@
 //  Copyright © 2015 Aeris Weather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 typedef NS_ENUM(NSUInteger, AWFMeasurement) {
 	AWFMeasurementNone = 0,
 	AWFMeasurementTemperature,

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFObjectLoader+Private.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFObjectLoader+Private.h
diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFObjectLoader.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFObjectLoader.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import <Aeris/AWFGlobals.h>
 
 @class AerisAPIClient, AWFObject, AWFObjectLoader, AWFRequestOptions, AWFPlace;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFRequestQuery.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFRequestQuery.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
 #import <Aeris/AWFRequestOptions.h>
 
 /**

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFResponse.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFResponse.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 /**
  *  An `AWFResponse` object handles the JSON dictionary object returned from the API and performs validation to check for errors and whether or not the
  *  response was successful.

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFStormCell.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFStormCell.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
+#import <CoreLocation/CoreLocation.h>
 #import <Aeris/AWFGeographicObject.h>
 
 @interface AWFStormCell : AWFGeographicObject

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFWeatherDataType.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AWFWeatherDataType.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 typedef NS_ENUM (NSUInteger, AWFWeatherDataType) {
 	AWFWeatherDataTypeWeather = 0,
 	AWFWeatherDataTypeSkyCover,

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/Aeris.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/Aeris.h
@@ -28,6 +28,7 @@
 
 #import <Aeris/AWFPlacesLoader.h>
 #import <Aeris/AWFVenuesLoader.h>
+#import <Aeris/AWFCountriesLoader.h>
 #import <Aeris/AWFObservationsLoader.h>
 #import <Aeris/AWFForecastsLoader.h>
 #import <Aeris/AWFAdvisoriesLoader.h>
@@ -52,6 +53,7 @@
 #import <Aeris/AWFPlace.h>
 #import <Aeris/AWFRelativeTo.h>
 #import <Aeris/AWFVenue.h>
+#import <Aeris/AWFCountry.h>
 #import <Aeris/AWFObservation.h>
 #import <Aeris/AWFObservationSummary.h>
 #import <Aeris/AWFForecast.h>
@@ -89,4 +91,5 @@
 #import <Aeris/NSNumber+Aeris.h>
 #import <Aeris/NSObject+Aeris.h>
 #import <Aeris/NSArray+Aeris.h>
-#import <Aeris/UIDevice+Aeris.h>
+#import <Aeris/UIDevice+Aeris.h>
+#import <Aeris/NSCachedURLResponse+Aeris.h>
diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AerisAPIClient.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AerisAPIClient.h
@@ -6,8 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
-#import "AFHTTPRequestOperationManager.h"
-
+#import <AFNetworking/AFNetworking.h>
 #import <Aeris/AWFResponse.h>
 
 extern NSString * const AerisAPIServer;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AerisEngine.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/AerisEngine.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import <Aeris/AWFLog.h>
 
 extern NSString *const AWFEngineIsReady;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/CLLocation+Aeris.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/CLLocation+Aeris.h
@@ -6,6 +6,9 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
+#import <CoreLocation/CoreLocation.h>
+
 static const double kAWFDegreesToRadians = M_PI / 180.0;
 static const double kAWFRadiansToDegrees = 180.0 / M_PI;
 static const double kAWFEarthRadius = 6371.01;

diff --git a/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/UIDevice+Aeris.h b/AerisWeatherSDK/Aeris.framework/Versions/A/Headers/UIDevice+Aeris.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
+
 typedef NS_ENUM(NSUInteger, AWFDevicePlatform) {
 	AWFDevicePlatformUnknown = 0,
 

diff --git a/.../Aeris.framework/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap b/.../Aeris.framework/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap
diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Modules b/AerisWeatherSDK/AerisGoogleMap.framework/Modules
@@ -0,0 +1 @@
+Versions/Current/Modules
diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/AerisGoogleMap b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/AerisGoogleMap
diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMAnimationContainer.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMAnimationContainer.h
diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMAnnotation.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMAnnotation.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 HAMweather, LLC. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import <GoogleMaps/GoogleMaps.h>
 
 @protocol AWFGMAnnoation <NSObject>

diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMMultiShapeOverlay.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMMultiShapeOverlay.h
@@ -7,6 +7,7 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
+#import <AerisMap/AerisMap.h>
 
 @interface AWFGMMultiShapeOverlay : GMSGroundOverlay <AWFStyledMapItem, AWFMultiShapeOverlay>
 

diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMStyledAnnotation.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGMStyledAnnotation.h
@@ -7,7 +7,7 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
-#import <AerisMap/AWFStyledAnnotation.h>
+#import <AerisMap/AerisMap.h>
 
 @class AWFObject, AWFAnnotationStyle;
 

diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGoogleMapStrategy.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AWFGoogleMapStrategy.h
@@ -7,6 +7,7 @@
 //
 
 #import <GoogleMaps/GoogleMaps.h>
+#import <AerisMap/AerisMap.h>
 
 @interface AWFGoogleMapStrategy : NSObject <AWFMapStrategy, GMSMapViewDelegate>
 

diff --git a/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AerisGoogleMap.h b/AerisWeatherSDK/AerisGoogleMap.framework/Versions/A/Headers/AerisGoogleMap.h
@@ -6,11 +6,15 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
+#import <AerisMap/AerisMap.h>
+
 #import <AerisGoogleMap/AWFGoogleMapStrategy.h>
 
 #import <AerisGoogleMap/AWFGMImageDataLayer.h>
 #import <AerisGoogleMap/AWFGMTileDataLayer.h>
 
 #import <AerisGoogleMap/AWFGMAnnotation.h>
 #import <AerisGoogleMap/AWFGMStyledAnnotation.h>
-#import <AerisGoogleMap/AWFGMPolygon.h>
+#import <AerisGoogleMap/AWFGMPolyline.h>
+#import <AerisGoogleMap/AWFGMPolygon.h>
+#import <AerisGoogleMap/AWFGMMultiShapeOverlay.h>
diff --git a/...gleMap.framework/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap b/...gleMap.framework/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap
@@ -1,6 +1,6 @@
 framework module AerisGoogleMap {
     umbrella header "AerisGoogleMap.h"
-
+    
     export *
     module * { export * }
 }
diff --git a/AerisWeatherSDK/AerisMap.framework/Modules b/AerisWeatherSDK/AerisMap.framework/Modules
@@ -0,0 +1 @@
+Versions/Current/Modules
diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/AerisMap b/AerisWeatherSDK/AerisMap.framework/Versions/A/AerisMap
diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimatableOverlay.h b/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimatableOverlay.h
@@ -6,9 +6,8 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
-#import "AWFAnimation.h"
+#import <MapKit/MapKit.h>
+#import <AerisMap/AWFAnimation.h>
 
 @class AWFAnimation;
 

diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimation+Private.h b/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimation+Private.h
diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimation.h b/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimation.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class AWFAnimation, AWFAnimationTimeline, AWFCoordinateBounds;
 

diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimationContainer.h b/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimationContainer.h
diff --git a/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimationTimeline.h b/AerisWeatherSDK/AerisMap.framework/Versions/A/Headers/AWFAnimationTimeline.h
@@ -7,8 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#import "AWFAnimation.h"
+#import <AerisMap/AWFAnimation.h>
 
 /**
  *  An `AWFAnimationTimeline` object is a subclass of `AWFAnimation` that manages and controls multiple
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     //  Copyright (c) 2014 HAMweather, LLC. All rights reserved.
     //
+    #import <Foundation/Foundation.h>
     /**
      *  The model types currently supported.
      */
@@ Expand Down @@