feedhenry · coco-jam · Mar 3, 2019 · Mar 5, 2019 · Mar 5, 2019 · Apr 10, 2019
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,8 @@ docset-installed.txt
 # Exclude cocoapods folder
 Pods/
 *.xcworkspace
+Podfile.lock
+Pods/
 
 # Exclude the build directory
 build/*

diff --git a/FeedHenry.podspec b/FeedHenry.podspec
@@ -6,12 +6,12 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/feedhenry'
   s.license      = 'FeedHenry'
   s.author       = 'Red Hat, Inc.'
-  s.source       = { :git => 'https://github.com/feedhenry/fh-ios-swift-sdk.git', :tag => s.version }
+  s.source       = { :git => 'https://github.com/feedhenry/fh-ios-swift-sdk.git', :branch => 'Swift5' }
   s.platform     = :ios, 9.0
   s.source_files = 'FeedHenry/**/*.{swift}', 'FeedHenry/**/*.{h,m}', 'FeedHenry/*.{h,m}'
   s.module_map = 'FeedHenry/FeedHenry.modulemap'
   s.requires_arc = true
   s.dependency 'AeroGearHttp', '2.0.0'
-  s.dependency 'AeroGearPush-Swift', '3.0.0'
-  s.dependency 'ReachabilitySwift', '4.1.0'
+  s.dependency 'AeroGearPush-Sw', '3.0.9'
+  s.dependency 'ReachabilitySwift', '4.3.1'
 end
diff --git a/FeedHenry.xcodeproj/project.pbxproj b/FeedHenry.xcodeproj/project.pbxproj
@@ -386,12 +386,12 @@
 				TargetAttributes = {
 					4878D5D91B579965004518C4 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					4878D5E31B579965004518C4 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -400,6 +400,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 4878D5D01B579965004518C4;
@@ -456,9 +457,9 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-FeedHenry-FeedHenryTests/Pods-FeedHenry-FeedHenryTests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-FeedHenry-FeedHenryTests/Pods-FeedHenry-FeedHenryTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AeroGearHttp/AeroGearHttp.framework",
-				"${BUILT_PRODUCTS_DIR}/AeroGearPush-Swift/AeroGearPush.framework",
+				"${BUILT_PRODUCTS_DIR}/AeroGearPush-Sw/AeroGearPush.framework",
 				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
 				"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
 				"${BUILT_PRODUCTS_DIR}/OHHTTPStubs/OHHTTPStubs.framework",
@@ -473,7 +474,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FeedHenry-FeedHenryTests/Pods-FeedHenry-FeedHenryTests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FeedHenry-FeedHenryTests/Pods-FeedHenry-FeedHenryTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		48F1A9EB1C98B3FC004E7B50 /* ShellScript */ = {
@@ -695,9 +696,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Sw.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -721,8 +722,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Sw.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -737,9 +738,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.feedhenry.FeedHenryTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "FeedHenryTests/FeedHenryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Sw.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -754,8 +755,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.feedhenry.FeedHenryTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "FeedHenryTests/FeedHenryTests-Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Sw.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/FeedHenry/Config/Config.swift b/FeedHenry/Config/Config.swift
@@ -25,7 +25,7 @@ open class Config {
     let propertiesFile: String
     var bundle: Bundle
     /// Singleton instance.
-    open static var instance = Config()
+    public static var instance = Config()
 
     /**
      Constructor.

diff --git a/FeedHenry/FH.swift b/FeedHenry/FH.swift
@@ -54,7 +54,7 @@ open class FH: NSObject {
      - Returns: true if the device is online.
      */
     @objc
-    open static var isOnline: Bool {
+    public static var isOnline: Bool {
         guard let reachability = self.reachability else {return false}
         return reachability.connection != .none
     }
@@ -64,7 +64,7 @@ open class FH: NSObject {
 
      - Returns: the NSError from FH.init method.
      */
-    open static var getInitError: NSError? {
+    public static var getInitError: NSError? {
         return initError
     }
 
@@ -342,7 +342,7 @@ open class FH: NSObject {
      - parameter applicationState: to make sure the app was in background.
      - parameter userInfo: contains the message id used to collect metrics.
      */
-    open class func sendMetricsWhenAppAwoken(applicationState: UIApplicationState, userInfo: [AnyHashable: Any]) {
+    open class func sendMetricsWhenAppAwoken(applicationState: UIApplication.State, userInfo: [AnyHashable: Any]) {
         PushAnalytics.sendMetricsWhenAppAwoken(applicationState: applicationState, userInfo: userInfo)
     }
 

diff --git a/FeedHenry/FeedHenry-Sw.h b/FeedHenry/FeedHenry-Sw.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 4.2.1 effective-4.1.50 (swiftlang-1000.11.42 clang-1000.11.45.1)
+// Generated by Apple Swift version 5.0 (swiftlang-1001.0.69.5 clang-1001.0.46.3)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -20,7 +20,7 @@
 #endif
 
 #pragma clang diagnostic ignored "-Wauto-import"
-#include <objc/NSObject.h>
+#include <Foundation/Foundation.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -163,6 +163,9 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
 #endif
 #if __has_feature(modules)
+#if __has_warning("-Watimport-in-framework-header")
+#pragma clang diagnostic ignored "-Watimport-in-framework-header"
+#endif
 @import Foundation;
 @import ObjectiveC;
 @import UIKit;
@@ -226,7 +229,7 @@ SWIFT_CLASS("_TtC9FeedHenry19OAuthViewController")
 /// Override to deal with error.
 - (void)webView:(UIWebView * _Nonnull)webView didFailLoadWithError:(NSError * _Nonnull)error;
 /// Override to retrieve auth token and store it.
-- (BOOL)webView:(UIWebView * _Nonnull)webView shouldStartLoadWithRequest:(NSURLRequest * _Nonnull)request navigationType:(UIWebViewNavigationType)navigationType SWIFT_WARN_UNUSED_RESULT;
+- (BOOL)webView:(UIWebView * _Nonnull)webView shouldStartLoadWithRequest:(NSURLRequest * _Nonnull)request navigationType:(enum UIWebViewNavigationType)navigationType SWIFT_WARN_UNUSED_RESULT;
 /// Override for logging purpose.
 - (void)webViewDidStartLoad:(UIWebView * _Nonnull)webView;
 /// Override to close the view on success.

diff --git a/FeedHenry/OAuth/OAuthViewController.swift b/FeedHenry/OAuth/OAuthViewController.swift
@@ -40,7 +40,7 @@ open class OAuthViewController: UIViewController, UIWebViewDelegate {
     }
 
     /// Override to retrieve auth token and store it.
-    open func webView(_ webView: UIWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebViewNavigationType) -> Bool {
+    open func webView(_ webView: UIWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebView.NavigationType) -> Bool {
         print("Start to load url: \(String(describing: request.url))")
         authInfo = [:]
         do {

diff --git a/FeedHenry/Sync/FHSyncClient.m b/FeedHenry/Sync/FHSyncClient.m
@@ -16,7 +16,7 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
-#import <FeedHenry/FeedHenry-Sw.h>
+#import "../FeedHenry-Sw.h"
 #import "FHSyncClient.h"
 #import "FHSyncUtils.h"
 #import "FHSyncPendingDataRecord.h"

diff --git a/FeedHenry/Sync/FHSyncDataset.m b/FeedHenry/Sync/FHSyncDataset.m
@@ -21,7 +21,7 @@
 #import "FHSyncDataRecord.h"
 #import "FHDefines.h"
 #import "FHSyncNotificationMessage.h"
-#import <FeedHenry/FeedHenry-Sw.h>
+#import "../FeedHenry-Sw.h"
 
 static NSString *const kStorageFilePath = @"sync.json";
 

diff --git a/Podfile b/Podfile
@@ -6,12 +6,12 @@ use_frameworks!
 
 target 'FeedHenry' do
 	pod 'AeroGearHttp', '2.0.0'
-	pod 'AeroGearPush-Swift', '3.0.0'
-	pod 'ReachabilitySwift', '4.1.0'
+	pod 'AeroGearPush-Sw', '3.0.9'
+	pod 'ReachabilitySwift', '4.3.1'
 
 	target 'FeedHenryTests' do
-		pod 'OHHTTPStubs', '5.2.2'
-		pod 'OHHTTPStubs/Swift', '5.2.2'
-		pod 'OCMock', '3.3.1'
+		pod 'OHHTTPStubs', '7.0.0'
+		pod 'OHHTTPStubs/Swift', '7.0.0'
+		pod 'OCMock', '3.4.3'
 	end
 end
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@
 
 The iOS Software Development Kit to connect to the [FeedHenry platform.](http://www.feedhenry.com)
 
+> NOTE: This is an experimental branch to enable  Swift 4.2 builds to work with the new build system. The Swift4.2 branch is not a supported configuration.
+
 **The Swift version of FeedHenry SDK is a Work In Progress. If you want to use full feature SDK go to [fh-ios-sdk](https://github.com/feedhenry/fh-ios-sdk/).**
 
 ## Release Process