IOS-1480 Avoid framework imports. IOS-1480
authorDirk Zimmermann <dz@pep.security>
Wed, 20 Mar 2019 16:40:35 +0100
branchIOS-1480
changeset 90232760267cd59
parent 876 0899b80e06e7
child 903 e9428f52fd88
child 904 fe9563f1982b
IOS-1480 Avoid framework imports.
pEpObjCAdapter/NSDictionary+CommType.m
pEpObjCAdapter/NSDictionary+Debug.m
pEpObjCAdapter/NSError+PEP+Internal.h
pEpObjCAdapter/NSError+PEP.m
pEpObjCAdapter/NSMutableDictionary+PEP.m
pEpObjCAdapter/PEPIdentity.m
pEpObjCAdapter/PEPInternalSession.h
pEpObjCAdapter/PEPInternalSession.m
pEpObjCAdapter/PEPMessage.m
pEpObjCAdapter/PEPMessageUtil.m
pEpObjCAdapter/PEPSession.m
pEpObjCAdapter/PEPSync.m
pEpObjCAdapterFramework/NSDictionary+CommType.h
pEpObjCAdapterFramework/NSNumber+PEPRating.h
pEpObjCAdapterFramework/PEPAttachment.h
pEpObjCAdapterFramework/PEPMessage.h
pEpObjCAdapterFramework/PEPSessionProtocol.h
pEpObjCTests/PEPMessageUtilTest.m
pEpObjCTests/PEPSessionTest.m
pEpObjCTests/TestUtils/PEPTestUtils.m
     1.1 --- a/pEpObjCAdapter/NSDictionary+CommType.m	Fri Mar 15 16:01:34 2019 +0100
     1.2 +++ b/pEpObjCAdapter/NSDictionary+CommType.m	Wed Mar 20 16:40:35 2019 +0100
     1.3 @@ -10,7 +10,7 @@
     1.4  
     1.5  #import "NSDictionary+CommType.h"
     1.6  
     1.7 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     1.8 +#import "PEPConstants.h"
     1.9  
    1.10  #import "PEPMessageUtil.h"
    1.11  
     2.1 --- a/pEpObjCAdapter/NSDictionary+Debug.m	Fri Mar 15 16:01:34 2019 +0100
     2.2 +++ b/pEpObjCAdapter/NSDictionary+Debug.m	Wed Mar 20 16:40:35 2019 +0100
     2.3 @@ -8,7 +8,7 @@
     2.4  
     2.5  #import "NSDictionary+Debug.h"
     2.6  
     2.7 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     2.8 +#import "PEPConstants.h"
     2.9  
    2.10  #import "PEPMessageUtil.h"
    2.11  
     3.1 --- a/pEpObjCAdapter/NSError+PEP+Internal.h	Fri Mar 15 16:01:34 2019 +0100
     3.2 +++ b/pEpObjCAdapter/NSError+PEP+Internal.h	Wed Mar 20 16:40:35 2019 +0100
     3.3 @@ -9,7 +9,7 @@
     3.4  #ifndef NSError_PEP_Internal_h
     3.5  #define NSError_PEP_Internal_h
     3.6  
     3.7 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
     3.8 +#import "PEPEngineTypes.h"
     3.9  
    3.10  /**
    3.11   Extension for creating `NSError`s from `PEP_STATUS`
     4.1 --- a/pEpObjCAdapter/NSError+PEP.m	Fri Mar 15 16:01:34 2019 +0100
     4.2 +++ b/pEpObjCAdapter/NSError+PEP.m	Wed Mar 20 16:40:35 2019 +0100
     4.3 @@ -6,7 +6,7 @@
     4.4  //  Copyright © 2018 p≡p. All rights reserved.
     4.5  //
     4.6  
     4.7 -#import <PEPObjCAdapterFramework/PEPTypes.h>
     4.8 +#import "PEPTypes.h"
     4.9  
    4.10  #import "NSError+PEP.h"
    4.11  #import "NSError+PEP+Internal.h"
     5.1 --- a/pEpObjCAdapter/NSMutableDictionary+PEP.m	Fri Mar 15 16:01:34 2019 +0100
     5.2 +++ b/pEpObjCAdapter/NSMutableDictionary+PEP.m	Wed Mar 20 16:40:35 2019 +0100
     5.3 @@ -8,7 +8,7 @@
     5.4  
     5.5  #import "NSMutableDictionary+PEP.h"
     5.6  
     5.7 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     5.8 +#import "PEPConstants.h"
     5.9  
    5.10  #import "PEPMessageUtil.h"
    5.11  
     6.1 --- a/pEpObjCAdapter/PEPIdentity.m	Fri Mar 15 16:01:34 2019 +0100
     6.2 +++ b/pEpObjCAdapter/PEPIdentity.m	Wed Mar 20 16:40:35 2019 +0100
     6.3 @@ -6,8 +6,8 @@
     6.4  //  Copyright © 2017 p≡p. All rights reserved.
     6.5  //
     6.6  
     6.7 -#import <PEPObjCAdapterFramework/PEPIdentity.h>
     6.8 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     6.9 +#import "PEPIdentity.h"
    6.10 +#import "PEPConstants.h"
    6.11  
    6.12  #import "pEpEngine.h"
    6.13  #import "PEPMessageUtil.h"
     7.1 --- a/pEpObjCAdapter/PEPInternalSession.h	Fri Mar 15 16:01:34 2019 +0100
     7.2 +++ b/pEpObjCAdapter/PEPInternalSession.h	Wed Mar 20 16:40:35 2019 +0100
     7.3 @@ -8,7 +8,7 @@
     7.4  
     7.5  #import <Foundation/Foundation.h>
     7.6  
     7.7 -#import <PEPObjCAdapterFramework/PEPSessionProtocol.h>
     7.8 +#import "PEPSessionProtocol.h"
     7.9  
    7.10  #import "sync_api.h"
    7.11  
     8.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Fri Mar 15 16:01:34 2019 +0100
     8.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Wed Mar 20 16:40:35 2019 +0100
     8.3 @@ -8,7 +8,7 @@
     8.4  
     8.5  #import "PEPInternalSession.h"
     8.6  
     8.7 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     8.8 +#import "PEPConstants.h"
     8.9  
    8.10  #import "PEPObjCAdapter.h"
    8.11  #import "PEPObjCAdapter+Internal.h"
    8.12 @@ -18,7 +18,7 @@
    8.13  #import "NSArray+Extension.h"
    8.14  #import "NSDictionary+CommType.h"
    8.15  #import "NSDictionary+Debug.h"
    8.16 -#import <PEPObjCAdapterFramework/PEPIdentity.h>
    8.17 +#import "PEPIdentity.h"
    8.18  #import "PEPMessage.h"
    8.19  #import "NSError+PEP+Internal.h"
    8.20  #import "PEPAutoPointer.h"
     9.1 --- a/pEpObjCAdapter/PEPMessage.m	Fri Mar 15 16:01:34 2019 +0100
     9.2 +++ b/pEpObjCAdapter/PEPMessage.m	Wed Mar 20 16:40:35 2019 +0100
     9.3 @@ -8,8 +8,8 @@
     9.4  
     9.5  #import "PEPMessage.h"
     9.6  
     9.7 -#import <PEPObjCAdapterFramework/PEPIdentity.h>
     9.8 -#import <PEPObjCAdapterFramework/PEPConstants.h>
     9.9 +#import "PEPIdentity.h"
    9.10 +#import "PEPConstants.h"
    9.11  
    9.12  #import "NSObject+Extension.h"
    9.13  #import "NSMutableDictionary+PEP.h"
    10.1 --- a/pEpObjCAdapter/PEPMessageUtil.m	Fri Mar 15 16:01:34 2019 +0100
    10.2 +++ b/pEpObjCAdapter/PEPMessageUtil.m	Wed Mar 20 16:40:35 2019 +0100
    10.3 @@ -8,8 +8,8 @@
    10.4  
    10.5  #import "PEPMessageUtil.h"
    10.6  
    10.7 -#import <PEPObjCAdapterFramework/PEPConstants.h>
    10.8 -#import <PEPObjCAdapterFramework/PEPIdentity.h>
    10.9 +#import "PEPConstants.h"
   10.10 +#import "PEPIdentity.h"
   10.11  
   10.12  #import "PEPMessage.h"
   10.13  #import "PEPAttachment.h"
    11.1 --- a/pEpObjCAdapter/PEPSession.m	Fri Mar 15 16:01:34 2019 +0100
    11.2 +++ b/pEpObjCAdapter/PEPSession.m	Wed Mar 20 16:40:35 2019 +0100
    11.3 @@ -10,7 +10,7 @@
    11.4  
    11.5  #import "PEPInternalSession.h"
    11.6  #import "PEPSessionProvider.h"
    11.7 -#import <PEPObjCAdapterFramework/PEPIdentity.h>
    11.8 +#import "PEPIdentity.h"
    11.9  
   11.10  #import "PEPMessageUtil.h"
   11.11  #import "NSNumber+PEPRating.h"
    12.1 --- a/pEpObjCAdapter/PEPSync.m	Fri Mar 15 16:01:34 2019 +0100
    12.2 +++ b/pEpObjCAdapter/PEPSync.m	Wed Mar 20 16:40:35 2019 +0100
    12.3 @@ -11,7 +11,7 @@
    12.4  #import "PEPSendMessageDelegate.h"
    12.5  #import "PEPNotifyHandshakeDelegate.h"
    12.6  #import "PEPMessageUtil.h"
    12.7 -#import <PEPObjCAdapterFramework/PEPMessage.h>
    12.8 +#import "PEPMessage.h"
    12.9  #import "PEPQueue.h"
   12.10  #import "PEPLock.h"
   12.11  #import "PEPObjCAdapter.h"
    13.1 --- a/pEpObjCAdapterFramework/NSDictionary+CommType.h	Fri Mar 15 16:01:34 2019 +0100
    13.2 +++ b/pEpObjCAdapterFramework/NSDictionary+CommType.h	Wed Mar 20 16:40:35 2019 +0100
    13.3 @@ -8,7 +8,7 @@
    13.4  
    13.5  #import <Foundation/Foundation.h>
    13.6  
    13.7 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
    13.8 +#import "PEPEngineTypes.h"
    13.9  
   13.10  @interface NSDictionary (CommType)
   13.11  
    14.1 --- a/pEpObjCAdapterFramework/NSNumber+PEPRating.h	Fri Mar 15 16:01:34 2019 +0100
    14.2 +++ b/pEpObjCAdapterFramework/NSNumber+PEPRating.h	Wed Mar 20 16:40:35 2019 +0100
    14.3 @@ -8,8 +8,8 @@
    14.4  
    14.5  #import <Foundation/Foundation.h>
    14.6  
    14.7 -#import <PEPObjCAdapterFramework/PEPTypes.h>
    14.8 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
    14.9 +#import "PEPTypes.h"
   14.10 +#import "PEPEngineTypes.h"
   14.11  
   14.12  /**
   14.13   Extension for wrapping the engine's PEP_rating inside a NSNumber.
    15.1 --- a/pEpObjCAdapterFramework/PEPAttachment.h	Fri Mar 15 16:01:34 2019 +0100
    15.2 +++ b/pEpObjCAdapterFramework/PEPAttachment.h	Wed Mar 20 16:40:35 2019 +0100
    15.3 @@ -8,7 +8,7 @@
    15.4  
    15.5  #import <Foundation/Foundation.h>
    15.6  
    15.7 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
    15.8 +#import "PEPEngineTypes.h"
    15.9  
   15.10  @interface PEPAttachment : NSObject
   15.11  
    16.1 --- a/pEpObjCAdapterFramework/PEPMessage.h	Fri Mar 15 16:01:34 2019 +0100
    16.2 +++ b/pEpObjCAdapterFramework/PEPMessage.h	Wed Mar 20 16:40:35 2019 +0100
    16.3 @@ -8,8 +8,8 @@
    16.4  
    16.5  #import <Foundation/Foundation.h>
    16.6  
    16.7 -#import <PEPObjCAdapterFramework/PEPTypes.h>
    16.8 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
    16.9 +#import "PEPTypes.h"
   16.10 +#import "PEPEngineTypes.h"
   16.11  
   16.12  @class PEPIdentity;
   16.13  @class PEPAttachment;
    17.1 --- a/pEpObjCAdapterFramework/PEPSessionProtocol.h	Fri Mar 15 16:01:34 2019 +0100
    17.2 +++ b/pEpObjCAdapterFramework/PEPSessionProtocol.h	Wed Mar 20 16:40:35 2019 +0100
    17.3 @@ -8,8 +8,8 @@
    17.4  
    17.5  #import <Foundation/Foundation.h>
    17.6  
    17.7 -#import <PEPObjCAdapterFramework/PEPTypes.h>
    17.8 -#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
    17.9 +#import "PEPTypes.h"
   17.10 +#import "PEPEngineTypes.h"
   17.11  
   17.12  @class PEPLanguage;
   17.13  @class PEPIdentity;
    18.1 --- a/pEpObjCTests/PEPMessageUtilTest.m	Fri Mar 15 16:01:34 2019 +0100
    18.2 +++ b/pEpObjCTests/PEPMessageUtilTest.m	Wed Mar 20 16:40:35 2019 +0100
    18.3 @@ -9,7 +9,7 @@
    18.4  #import <XCTest/XCTest.h>
    18.5  
    18.6  #import "PEPMessageUtil.h"
    18.7 -#import <PEPObjCAdapterFramework/PEPObjCAdapterFramework.h>
    18.8 +#import "PEPObjCAdapterFramework.h"
    18.9  
   18.10  @interface PEPMessageUtilTest : XCTestCase
   18.11  @property pEp_identity *pepIdentitySomeOne;
    19.1 --- a/pEpObjCTests/PEPSessionTest.m	Fri Mar 15 16:01:34 2019 +0100
    19.2 +++ b/pEpObjCTests/PEPSessionTest.m	Wed Mar 20 16:40:35 2019 +0100
    19.3 @@ -8,7 +8,7 @@
    19.4  
    19.5  #import <XCTest/XCTest.h>
    19.6  
    19.7 -#import <PEPObjCAdapterFramework/PEPObjCAdapterFramework.h>
    19.8 +#import "PEPObjCAdapterFramework.h"
    19.9  
   19.10  #import "PEPObjCAdapter.h"
   19.11  #import "PEPMessage.h"
    20.1 --- a/pEpObjCTests/TestUtils/PEPTestUtils.m	Fri Mar 15 16:01:34 2019 +0100
    20.2 +++ b/pEpObjCTests/TestUtils/PEPTestUtils.m	Wed Mar 20 16:40:35 2019 +0100
    20.3 @@ -10,7 +10,7 @@
    20.4  
    20.5  #import "PEPTestUtils.h"
    20.6  
    20.7 -#import <PEPObjCAdapterFramework/PEPObjCAdapterFramework.h>
    20.8 +#import "PEPObjCAdapterFramework.h"
    20.9  #import "PEPInternalSession.h"
   20.10  #import "PEPMessage.h"
   20.11  #import "PEPSession.h"