Fix for xcode 11 + iOS Framework #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

FabienLydoire wants to merge 14 commits into sharefile-org:master from FabienLydoire:Fix-for-Xcode-11

.DS_Store

Binary file not shown.

.gitignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ShareFileSDK/ShareFileSDK.xcodeproj/project.xcworkspace/xcuserdata
		ShareFileSDK/ShareFileSDK.xcodeproj/xcuserdata

ShareFileSDK/.DS_Store

Binary file not shown.

ShareFileSDK/External/OCMock/NSNotificationCenter+OCMAdditions.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2009-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down @@

ShareFileSDK/External/OCMock/OCMArg.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2009-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down Expand Up / @@ -36,6 +36,10 @@ @@
     + (id *)setTo:(id)value;
     + (void *)setToValue:(NSValue *)value;
+    + (id)invokeBlock;
+    + (id)invokeBlockWithArgs:(id)first,... NS_REQUIRES_NIL_TERMINATION;
+    + (id)defaultValue;
     // internal use only
@@ Expand All / @@ -51,3 +55,4 @@ @@
     #else
       #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
     #endif

ShareFileSDK/External/OCMock/OCMConstraint.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2007-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2007-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down @@

ShareFileSDK/External/OCMock/OCMFunctions.h

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    /*
+     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors
+     *
+     *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+     *  not use these files except in compliance with the License. You may obtain
+     *  a copy of the License at
+     *
+     *      http://www.apache.org/licenses/LICENSE-2.0
+     *
+     *  Unless required by applicable law or agreed to in writing, software
+     *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+     *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+     *  License for the specific language governing permissions and limitations
+     *  under the License.
+     */
+    #import <Foundation/Foundation.h>
+    #if defined(__cplusplus)
+    #define OCMOCK_EXTERN extern "C"
+    #else
+    #define OCMOCK_EXTERN extern
+    #endif
+    OCMOCK_EXTERN BOOL OCMIsObjectType(const char *objCType);

ShareFileSDK/External/OCMock/OCMLocation.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    /*

     *  Copyright (c) 2014 Erik Doernenburg and contributors

     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors

     *

     *  Licensed under the Apache License, Version 2.0 (the "License"); you may

     *  not use these files except in compliance with the License. You may obtain

    @@ -15,6 +15,8 @@
  
     */

    #import <Foundation/Foundation.h>

    #import "OCMFunctions.h"

    @interface OCMLocation : NSObject

    {

    @@ -33,4 +35,4 @@
  
    @end

    extern OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);

    OCMOCK_EXTERN OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);

ShareFileSDK/External/OCMock/OCMMacroState.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    /*

     *  Copyright (c) 2014 Erik Doernenburg and contributors

     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors

     *

     *  Licensed under the Apache License, Version 2.0 (the "License"); you may

     *  not use these files except in compliance with the License. You may obtain

    @@ -24,7 +24,7 @@
  
    @interface OCMMacroState : NSObject

    {

        OCMRecorder *recorder;

        id recorder;

    }

    + (void)beginStubMacro;

    @@ -33,12 +33,16 @@
  
    + (void)beginExpectMacro;

    + (OCMStubRecorder *)endExpectMacro;

    + (void)beginRejectMacro;

    + (OCMStubRecorder *)endRejectMacro;

    + (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;

    + (void)endVerifyMacro;

    + (OCMMacroState *)globalState;

    - (OCMRecorder *)recorder;

    - (void)setRecorder:(id)aRecorder;

    - (id)recorder;

    - (void)switchToClassMethod;

ShareFileSDK/External/OCMock/OCMRecorder.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand All / @@ -24,6 +24,7 @@ @@
     {
         OCMockObject         *mockObject;
         OCMInvocationMatcher *invocationMatcher;
+        BOOL                 wasUsed;
     }
     - (instancetype)init;
@@ Expand All / @@ -32,8 +33,16 @@ @@
     - (void)setMockObject:(OCMockObject *)aMockObject;
     - (OCMInvocationMatcher *)invocationMatcher;
+    - (BOOL)wasUsed;
     - (id)classMethod;
     - (id)ignoringNonObjectArgs;
     @end
+    @interface OCMRecorder (Properties)
+    #define ignoringNonObjectArgs() _ignoringNonObjectArgs()
+    @property (nonatomic, readonly) OCMRecorder *(^ _ignoringNonObjectArgs)(void);
+    @end

ShareFileSDK/External/OCMock/OCMStubRecorder.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2004-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand All / @@ -14,8 +14,9 @@ @@
      *  under the License.
      */
-    #import "OCMRecorder.h"
+    #import <OCMock/OCMRecorder.h>
+    #import <OCMock/OCMFunctions.h>
+    #import <objc/runtime.h>
     @interface OCMStubRecorder : OCMRecorder
@@ Expand All / @@ -32,7 +33,14 @@ @@
     @interface OCMStubRecorder (Properties)
-    #define andReturn(aValue) _andReturn(({ typeof(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(typeof(_v))]; }))
+    #define andReturn(aValue) _andReturn(({                                             \
+      __typeof__(aValue) _val = (aValue);                                               \
+      NSValue *_nsval = [NSValue value:&_val withObjCType:@encode(__typeof__(_val))];   \
+      if (OCMIsObjectType(@encode(__typeof(_val)))) {                                   \
+          objc_setAssociatedObject(_nsval, "OCMAssociatedBoxedValue", *(__unsafe_unretained id *) (void *) &_val, OBJC_ASSOCIATION_RETAIN); \
+      }                                                                                 \
+      _nsval;                                                                           \
+    }))
     @property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
     #define andThrow(anException) _andThrow(anException)
@@ Expand All / @@ -50,6 +58,8 @@ @@
     #define andForwardToRealObject() _andForwardToRealObject()
     @property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
+    @property (nonatomic, readonly) OCMStubRecorder *(^ _ignoringNonObjectArgs)(void);
     @end
@@ Expand Down @@

ShareFileSDK/External/OCMock/OCMock.framework/Modules

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Versions/Current/Modules

...K/External/OCMock/OCMock.framework/Versions/A/Headers/NSNotificationCenter+OCMAdditions.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2009-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down @@

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMArg.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2009-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down Expand Up / @@ -36,6 +36,10 @@ @@
     + (id *)setTo:(id)value;
     + (void *)setToValue:(NSValue *)value;
+    + (id)invokeBlock;
+    + (id)invokeBlockWithArgs:(id)first,... NS_REQUIRES_NIL_TERMINATION;
+    + (id)defaultValue;
     // internal use only
@@ Expand All / @@ -51,3 +55,4 @@ @@
     #else
       #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
     #endif

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMConstraint.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2007-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2007-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand Down @@

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMFunctions.h

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    /*
+     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors
+     *
+     *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+     *  not use these files except in compliance with the License. You may obtain
+     *  a copy of the License at
+     *
+     *      http://www.apache.org/licenses/LICENSE-2.0
+     *
+     *  Unless required by applicable law or agreed to in writing, software
+     *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+     *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+     *  License for the specific language governing permissions and limitations
+     *  under the License.
+     */
+    #import <Foundation/Foundation.h>
+    #if defined(__cplusplus)
+    #define OCMOCK_EXTERN extern "C"
+    #else
+    #define OCMOCK_EXTERN extern
+    #endif
+    OCMOCK_EXTERN BOOL OCMIsObjectType(const char *objCType);

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMLocation.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    /*

     *  Copyright (c) 2014 Erik Doernenburg and contributors

     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors

     *

     *  Licensed under the Apache License, Version 2.0 (the "License"); you may

     *  not use these files except in compliance with the License. You may obtain

    @@ -15,6 +15,8 @@
  
     */

    #import <Foundation/Foundation.h>

    #import "OCMFunctions.h"

    @interface OCMLocation : NSObject

    {

    @@ -33,4 +35,4 @@
  
    @end

    extern OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);

    OCMOCK_EXTERN OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMMacroState.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    /*

     *  Copyright (c) 2014 Erik Doernenburg and contributors

     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors

     *

     *  Licensed under the Apache License, Version 2.0 (the "License"); you may

     *  not use these files except in compliance with the License. You may obtain

    @@ -24,7 +24,7 @@
  
    @interface OCMMacroState : NSObject

    {

        OCMRecorder *recorder;

        id recorder;

    }

    + (void)beginStubMacro;

    @@ -33,12 +33,16 @@
  
    + (void)beginExpectMacro;

    + (OCMStubRecorder *)endExpectMacro;

    + (void)beginRejectMacro;

    + (OCMStubRecorder *)endRejectMacro;

    + (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;

    + (void)endVerifyMacro;

    + (OCMMacroState *)globalState;

    - (OCMRecorder *)recorder;

    - (void)setRecorder:(id)aRecorder;

    - (id)recorder;

    - (void)switchToClassMethod;

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMRecorder.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2014-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand All / @@ -24,6 +24,7 @@ @@
     {
         OCMockObject         *mockObject;
         OCMInvocationMatcher *invocationMatcher;
+        BOOL                 wasUsed;
     }
     - (instancetype)init;
@@ Expand All / @@ -32,8 +33,16 @@ @@
     - (void)setMockObject:(OCMockObject *)aMockObject;
     - (OCMInvocationMatcher *)invocationMatcher;
+    - (BOOL)wasUsed;
     - (id)classMethod;
     - (id)ignoringNonObjectArgs;
     @end
+    @interface OCMRecorder (Properties)
+    #define ignoringNonObjectArgs() _ignoringNonObjectArgs()
+    @property (nonatomic, readonly) OCMRecorder *(^ _ignoringNonObjectArgs)(void);
+    @end

ShareFileSDK/External/OCMock/OCMock.framework/Versions/A/Headers/OCMStubRecorder.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
+     *  Copyright (c) 2004-2019 Erik Doernenburg and contributors
      *
      *  Licensed under the Apache License, Version 2.0 (the "License"); you may
      *  not use these files except in compliance with the License. You may obtain
@@ Expand All / @@ -14,8 +14,9 @@ @@
      *  under the License.
      */
-    #import "OCMRecorder.h"
+    #import <OCMock/OCMRecorder.h>
+    #import <OCMock/OCMFunctions.h>
+    #import <objc/runtime.h>
     @interface OCMStubRecorder : OCMRecorder
@@ Expand All / @@ -32,7 +33,14 @@ @@
     @interface OCMStubRecorder (Properties)
-    #define andReturn(aValue) _andReturn(({ typeof(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(typeof(_v))]; }))
+    #define andReturn(aValue) _andReturn(({                                             \
+      __typeof__(aValue) _val = (aValue);                                               \
+      NSValue *_nsval = [NSValue value:&_val withObjCType:@encode(__typeof__(_val))];   \
+      if (OCMIsObjectType(@encode(__typeof(_val)))) {                                   \
+          objc_setAssociatedObject(_nsval, "OCMAssociatedBoxedValue", *(__unsafe_unretained id *) (void *) &_val, OBJC_ASSOCIATION_RETAIN); \
+      }                                                                                 \
+      _nsval;                                                                           \
+    }))
     @property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
     #define andThrow(anException) _andThrow(anException)
@@ Expand All / @@ -50,6 +58,8 @@ @@
     #define andForwardToRealObject() _andForwardToRealObject()
     @property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
+    @property (nonatomic, readonly) OCMStubRecorder *(^ _ignoringNonObjectArgs)(void);
     @end
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix for xcode 11 + iOS Framework #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Fix for xcode 11 + iOS Framework #1

Are you sure you want to change the base?

Uh oh!

Fix for xcode 11 + iOS Framework #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!