Cleanup warnings for Cocoapods

RNCryptor · Jun 22, 2017 · c73a0aa · c73a0aa
1 parent e0995c5
commit c73a0aa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+# Version 3.0.5
+
+# Clean up warnings for CocoaPods
+
 # Version 3.0.4
 
 * Remove non-modular header from framework header #11

diff --git a/RNCryptor-objc.podspec b/RNCryptor-objc.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'RNCryptor-objc'
-  s.version = '3.0.4'
+  s.version = '3.0.5'
   s.summary = 'Encryptor/Decryptor for iOS.'
   s.authors = {'Rob Napier' => 'robnapier@gmail.com'}
   s.license = { 

diff --git a/RNCryptor.xcodeproj/project.pbxproj b/RNCryptor.xcodeproj/project.pbxproj
@@ -1199,7 +1199,7 @@
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = NO;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1241,7 +1241,7 @@
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = NO;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/RNCryptor/RNCryptor.m b/RNCryptor/RNCryptor.m
@@ -317,7 +317,10 @@ + (NSData *)keyForPassword:(NSString *)password salt:(NSData *)salt settings:(RN
                CCPseudoRandomAlgorithm prf, uint rounds,
                uint8_t *derivedKey, size_t derivedKeyLen);
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
   PBKDF = CCKeyDerivationPBKDF ?: RN_CCKeyDerivationPBKDF;
+#pragma clang diagnostic pop
 
   result = PBKDF(keySettings.PBKDFAlgorithm,         // algorithm
                  passwordData.bytes,                 // password
@@ -396,7 +399,10 @@ + (NSData *)randomDataOfLength:(size_t)length
     result = SecRandomCopyBytes(NULL, length, data.mutableBytes);
   }
   else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
     result = RN_SecRandomCopyBytes(NULL, length, data.mutableBytes);
+#pragma clang diagnostic pop
   }
   NSAssert(result == 0, @"Unable to generate random bytes: %d", errno);