Bump 0.15.0

CHANGELOG

@@ -1,3 +1,4 @@
+Version 0.15.0
 - Fixes key expiration dates (again).
 - Detect and reject malformed packets.
 

Frameworks/ios/ObjectivePGP.framework/Headers/PGPKeyGenerator.h

@@ -8,11 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import <ObjectivePGP/PGPTypes.h>
+#import <ObjectivePGP/PGPKey.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class PGPKey;
-
 NS_SWIFT_NAME(KeyGenerator) @interface PGPKeyGenerator : NSObject
 
 @property (nonatomic) int keyBitsLength;

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/NSData+compression.h

@@ -4,7 +4,6 @@
 // rfc1950 (zlib format)
 
 #import <Foundation/Foundation.h>
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPLogging.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
     #endif
 #endif
 
-#define _PGPLogMacro(_level, _tag, _message) NSLog(@"[%s] %s: %s/%tu %@", _tag, _level, __PRETTY_FUNCTION__, __LINE__, _message())
+#define _PGPLogMacro(_level, _tag, _message) NSLog(@"[%s] %s: %s/%@ %@", _tag, _level, __PRETTY_FUNCTION__, @(__LINE__), _message())
 
 #if PGP_LOG_LEVEL >= PGP_DEBUG_LEVEL
 #define PGPLogDebug(format, ...)                                                     \

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPPartialKey+Private.h

@@ -6,7 +6,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPPartialKey.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPPartialSubKey+Private.h

@@ -6,7 +6,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPPartialSubKey.h"
 
 @interface PGPPartialSubKey ()
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket+Private.h

@@ -7,7 +7,6 @@
 //
 
 #import "PGPPublicKeyPacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket.h

@@ -8,7 +8,8 @@
 //  Tag 6
 
 #import "PGPPacketFactory.h"
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPFingerprint.h"
+#import "PGPKeyID.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPSecretKeyPacket+Private.h

@@ -9,7 +9,6 @@
 #import "PGPPublicKeyPacket+Private.h"
 #import "PGPS2K.h"
 #import "PGPSecretKeyPacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket+Private.h

@@ -7,7 +7,6 @@
 //
 
 #import "PGPSignaturePacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket.h

@@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable, readonly) PGPKeyID *issuerKeyID; // computed
 @property (nonatomic, copy, readonly) NSArray<PGPSignatureSubpacket *> *subpackets; // computed
 @property (nonatomic, nullable, readonly) NSDate *expirationDate; // computed
+/// Key expiration time interval. To be calculated since key creation date. NSNotFound if not specified.
+@property (nonatomic, assign, readonly) NSTimeInterval keyExpirationTimeInterval; // computed
 @property (nonatomic, readonly, readonly, getter=isExpired) BOOL expired; // computed
 @property (nonatomic, nullable, readonly) NSDate *creationDate; // computed
 @property (nonatomic, readonly, readonly, getter=isPrimaryUserID) BOOL primaryUserID; // computed

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPUser+Private.h

@@ -5,10 +5,10 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
-#import <ObjectivePGP/PGPUserIDPacket.h>
-#import <ObjectivePGP/PGPUserAttributePacket.h>
-#import <ObjectivePGP/PGPSignaturePacket.h>
+#import "PGPUser.h"
+#import "PGPUserIDPacket.h"
+#import "PGPUserAttributePacket.h"
+#import "PGPSignaturePacket.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/ios/ObjectivePGP.framework/PrivateHeaders/PGPUserAttributeImageSubpacket.h

@@ -5,7 +5,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP-Private.h>
+#import "PGPUserAttributeSubpacket.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/Headers/PGPKeyGenerator.h

@@ -8,11 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import <ObjectivePGP/PGPTypes.h>
+#import <ObjectivePGP/PGPKey.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class PGPKey;
-
 NS_SWIFT_NAME(KeyGenerator) @interface PGPKeyGenerator : NSObject
 
 @property (nonatomic) int keyBitsLength;

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/NSData+compression.h

@@ -4,7 +4,6 @@
 // rfc1950 (zlib format)
 
 #import <Foundation/Foundation.h>
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPLogging.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
     #endif
 #endif
 
-#define _PGPLogMacro(_level, _tag, _message) NSLog(@"[%s] %s: %s/%tu %@", _tag, _level, __PRETTY_FUNCTION__, __LINE__, _message())
+#define _PGPLogMacro(_level, _tag, _message) NSLog(@"[%s] %s: %s/%@ %@", _tag, _level, __PRETTY_FUNCTION__, @(__LINE__), _message())
 
 #if PGP_LOG_LEVEL >= PGP_DEBUG_LEVEL
 #define PGPLogDebug(format, ...)                                                     \

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPPartialKey+Private.h

@@ -6,7 +6,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPPartialKey.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPPartialSubKey+Private.h

@@ -6,7 +6,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPPartialSubKey.h"
 
 @interface PGPPartialSubKey ()
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPPublicKeyPacket+Private.h

@@ -7,7 +7,6 @@
 //
 
 #import "PGPPublicKeyPacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPPublicKeyPacket.h

@@ -8,7 +8,8 @@
 //  Tag 6
 
 #import "PGPPacketFactory.h"
-#import <ObjectivePGP/ObjectivePGP.h>
+#import "PGPFingerprint.h"
+#import "PGPKeyID.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPSecretKeyPacket+Private.h

@@ -9,7 +9,6 @@
 #import "PGPPublicKeyPacket+Private.h"
 #import "PGPS2K.h"
 #import "PGPSecretKeyPacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPSignaturePacket+Private.h

@@ -7,7 +7,6 @@
 //
 
 #import "PGPSignaturePacket.h"
-#import <ObjectivePGP/ObjectivePGP.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPSignaturePacket.h

@@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable, readonly) PGPKeyID *issuerKeyID; // computed
 @property (nonatomic, copy, readonly) NSArray<PGPSignatureSubpacket *> *subpackets; // computed
 @property (nonatomic, nullable, readonly) NSDate *expirationDate; // computed
+/// Key expiration time interval. To be calculated since key creation date. NSNotFound if not specified.
+@property (nonatomic, assign, readonly) NSTimeInterval keyExpirationTimeInterval; // computed
 @property (nonatomic, readonly, readonly, getter=isExpired) BOOL expired; // computed
 @property (nonatomic, nullable, readonly) NSDate *creationDate; // computed
 @property (nonatomic, readonly, readonly, getter=isPrimaryUserID) BOOL primaryUserID; // computed

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPUser+Private.h

@@ -5,10 +5,10 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP.h>
-#import <ObjectivePGP/PGPUserIDPacket.h>
-#import <ObjectivePGP/PGPUserAttributePacket.h>
-#import <ObjectivePGP/PGPSignaturePacket.h>
+#import "PGPUser.h"
+#import "PGPUserIDPacket.h"
+#import "PGPUserAttributePacket.h"
+#import "PGPSignaturePacket.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/PrivateHeaders/PGPUserAttributeImageSubpacket.h

@@ -5,7 +5,7 @@
 //  This notice may not be removed from this file.
 //
 
-#import <ObjectivePGP/ObjectivePGP-Private.h>
+#import "PGPUserAttributeSubpacket.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Frameworks/macosx/ObjectivePGP.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18D109</string>
+	<string>18F203</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10B61</string>
+	<string>10E1001</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18B71</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
 	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>1010</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>10B61</string>
+	<string>10E1001</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>

Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     colored2 (3.1.2)
     nanaimo (0.2.6)
     rouge (2.0.7)
-    xcodeproj (1.8.1)
+    xcodeproj (1.11.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

ObjectivePGP.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ObjectivePGP"
-  s.version      = "0.14.0"
+  s.version      = "0.15.0"
   s.summary      = "OpenPGP for iOS and macOS"
   s.description  = "Native OpenPGP (RFC 4880) implementation for iOS and macOS."
   s.homepage     = "http://objectivepgp.com"

ObjectivePGP.xcodeproj/xcshareddata/xcschemes/ObjectivePGP.xcscheme

@@ -22,7 +22,7 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "NO"
+            buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "NO"
             buildForAnalyzing = "NO">