Remove checks and assets for pre-iOS 8feature/ios8_minimum

19 files changed, 3 insertions, 24 deletions

diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 3dca39206..d8a5fa14f 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -6,11 +6,11 @@ s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
 s.author       = { "SmartDeviceLink Team" => "developer@smartdevicelink.com" }
-s.platform     = :ios, "7.0"
+s.platform     = :ios, "8.0"
 s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
 s.source_files = "SmartDeviceLink/*.{h,m}"
 s.requires_arc = true
-s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] }
+s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] }
 s.public_header_files = [
 'SmartDeviceLink/SmartDeviceLink.h',
 'SmartDeviceLink/SDLJingle.h',
diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m
index 73659eaf6..c69b059bb 100644
--- a/SmartDeviceLink/SDLLockScreenViewController.m
+++ b/SmartDeviceLink/SDLLockScreenViewController.m
@@ -164,19 +164,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 + (UIImage *)sdl_imageWithName:(NSString *)name {
-    UIImage* image = nil;
-    if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) {
-        NSString *bundlePath = [[NSBundle sdlBundle] bundlePath];
-        NSInteger deviceScale = [[UIScreen mainScreen] scale];
-        // We assume we are only dealing with PNGs.
-        NSString *fileName = [NSString stringWithFormat:@"%@%li.png", name, (long)deviceScale];
-        NSString *fullPath = [NSString stringWithFormat:@"%@/%@", bundlePath, fileName];
-        NSData *imageData = [NSData dataWithContentsOfFile:fullPath];
-        image = [UIImage imageWithData:imageData];
-    } else {
-        image = [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    }
-    
+    UIImage* image = [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
     return [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
 }
 
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h
index a88f735e2..d34a6a9fc 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.h
+++ b/SmartDeviceLink/SDLStreamingMediaManager.h
@@ -101,8 +101,6 @@ typedef void (^SDLStreamingEncryptionStartBlock)(BOOL success, BOOL encryption,
 /**
  *  This method will attempt to start a streaming video session. It will set up iOS's video encoder,  and call out to the head unit asking if it will start a video session. This will not use encryption.
  *
- *  @warning If this method is called on an 8.0 device, it will assert (in debug), or return a failure immediately to your block (in release).
- *
  *  @param startBlock A block that will be called with the result of attempting to start a video session
  */
 - (void)startVideoSessionWithStartBlock:(SDLStreamingStartBlock)startBlock;
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index bdd88af17..e39f24a4c 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -128,13 +128,6 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)startVideoSessionWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock {
-    if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) {
-        NSAssert(NO, @"SDL Video Sessions can only be run on iOS 8+ devices");
-        startBlock(NO, NO, [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorInvalidOperatingSystemVersion userInfo:nil]);
-
-        return;
-    }
-
     self.videoStartBlock = [startBlock copy];
     self.videoSessionEncrypted = (encryptionFlag == SDLEncryptionFlagAuthenticateAndEncrypt ? YES : NO);
 
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png
deleted file mode 100644
index 68f1c3ca7..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png
deleted file mode 100644
index 85fbc3446..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png
deleted file mode 100644
index af14aa8bb..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png
deleted file mode 100644
index ecc048331..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png
deleted file mode 100644
index fa38a0772..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png
deleted file mode 100644
index b59bda372..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png
deleted file mode 100644
index bb0662fe5..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png
deleted file mode 100644
index f45e6b299..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png
deleted file mode 100644
index d30fc404c..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png
deleted file mode 100644
index 68cf3a52d..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png
deleted file mode 100644
index 1427721a7..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png
deleted file mode 100644
index dfe0ab3f8..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png
deleted file mode 100644
index 1c35ef9b3..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png
deleted file mode 100644
index b7d0bd92a..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png
+++ /dev/null
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png
deleted file mode 100644
index b8b9ef757..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png
+++ /dev/null