From a951d11d97ddd2a9de51d8848a0ab9c44f422401 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Thu, 6 Apr 2017 19:49:59 -0400
Subject: [PATCH] [SSK] move iOSVersion to SSK

// FREEBIE
---
 Podfile                              |  2 +-
 Podfile.lock                         |  7 ++++---
 Signal/Signal-Prefix.pch             |  2 +-
 Signal/src/environment/iOSVersions.h | 14 --------------
 Signal/src/util/UIFont+OWS.m         |  1 -
 5 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 Signal/src/environment/iOSVersions.h

diff --git a/Podfile b/Podfile
index 52b196b6c..9a7631823 100644
--- a/Podfile
+++ b/Podfile
@@ -5,7 +5,7 @@ target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
     pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
     #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', commit: '60dcadb0d704458728d2b96f24eefc803bd80c92'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'SCWaveformView',             '~> 1.0'
diff --git a/Podfile.lock b/Podfile.lock
index d9a1338fb..3cd171122 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -116,13 +116,14 @@ DEPENDENCIES:
   - OpenSSL
   - PureLayout
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, commit `60dcadb0d704458728d2b96f24eefc803bd80c92`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
   AxolotlKit:
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
+    :commit: 60dcadb0d704458728d2b96f24eefc803bd80c92
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
@@ -132,7 +133,7 @@ CHECKOUT OPTIONS:
     :commit: cbf2f47d59dd54d6d720fe787f835bd767443bb6
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: 4f9e053248dd87f59e198be5d00be5b9bd48bfa9
+    :commit: 60dcadb0d704458728d2b96f24eefc803bd80c92
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
@@ -161,6 +162,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
 
-PODFILE CHECKSUM: a060377074cb361576f346a58d1503b3bd708440
+PODFILE CHECKSUM: 9666e5c942b3ab24f46ad5b00cf1397beef6276d
 
 COCOAPODS: 1.2.0
diff --git a/Signal/Signal-Prefix.pch b/Signal/Signal-Prefix.pch
index f5ce9f9e9..fb20452f6 100644
--- a/Signal/Signal-Prefix.pch
+++ b/Signal/Signal-Prefix.pch
@@ -19,7 +19,7 @@
     #import <SignalServiceKit/Constraints.h>
     #import <SignalServiceKit/OWSAnalytics.h>
     #import <SignalServiceKit/OWSDispatch.h>
-    #import "iOSVersions.h"
+    #import <SignalServiceKit/iOSVersions.h>
 
     #define SignalAlertView(title,msg) [[[UIAlertView alloc] initWithTitle:title message:msg delegate:nil cancelButtonTitle:NSLocalizedString(@"OK", @"") otherButtonTitles:nil, nil] show]    
 #endif
diff --git a/Signal/src/environment/iOSVersions.h b/Signal/src/environment/iOSVersions.h
deleted file mode 100644
index d1f60d207..000000000
--- a/Signal/src/environment/iOSVersions.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  iOSVersions.h
-//  Signal
-//
-//  Created by Frederic Jacobs on 03/08/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#include <Availability.h>
-
-#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(major, minor) \
-    ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = major, .minorVersion = minor, .patchVersion = 0}])
-
diff --git a/Signal/src/util/UIFont+OWS.m b/Signal/src/util/UIFont+OWS.m
index 8f5aa895e..7757294ae 100644
--- a/Signal/src/util/UIFont+OWS.m
+++ b/Signal/src/util/UIFont+OWS.m
@@ -3,7 +3,6 @@
 //
 
 #import "UIFont+OWS.h"
-#import "iOSVersions.h"
 
 @implementation UIFont (OWS)