Skip to content

Commit

Permalink
Merge pull request #37 from castle/fix/carthage-build
Browse files Browse the repository at this point in the history 
Fix/carthage build
  • Loading branch information
@aalekz
aalekz authored Mar 25, 2020
2 parents e2aba35 + da01543 commit f0c94e1
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 14 deletions.
64 changes: 58 additions & 6 deletions Castle.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
B6B355E81ED71F9D00C2B817 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6B355E71ED71F9D00C2B817 /* Info.plist */; };
B612D061242BD012005B41B7 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B612D060242BD012005B41B7 /* CoreTelephony.framework */; };
B63E94BE242BCCD1001993B7 /* CASContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B63E94BC242BCCD1001993B7 /* CASContext.h */; };
B63E94BF242BCCD1001993B7 /* CASContext.m in Sources */ = {isa = PBXBuildFile; fileRef = B63E94BD242BCCD1001993B7 /* CASContext.m */; };
B63E94C3242BCCE6001993B7 /* CASReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = B63E94C1242BCCE6001993B7 /* CASReachability.h */; };
B63E94C4242BCCE6001993B7 /* CASReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = B63E94C2242BCCE6001993B7 /* CASReachability.m */; };
B6B356061ED71FAD00C2B817 /* CASBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B355E91ED71FAD00C2B817 /* CASBatch.h */; };
B6B356071ED71FAD00C2B817 /* CASBatch.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B355EA1ED71FAD00C2B817 /* CASBatch.m */; };
B6B356081ED71FAD00C2B817 /* CASDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B355EB1ED71FAD00C2B817 /* CASDevice.h */; };
Expand Down Expand Up @@ -37,6 +41,11 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
B612D060242BD012005B41B7 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; };
B63E94BC242BCCD1001993B7 /* CASContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CASContext.h; path = Classes/CASContext.h; sourceTree = "<group>"; };
B63E94BD242BCCD1001993B7 /* CASContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CASContext.m; path = Classes/CASContext.m; sourceTree = "<group>"; };
B63E94C1242BCCE6001993B7 /* CASReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CASReachability.h; sourceTree = "<group>"; };
B63E94C2242BCCE6001993B7 /* CASReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CASReachability.m; sourceTree = "<group>"; };
B6B355DC1ED71D9700C2B817 /* Castle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Castle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B6B355E71ED71F9D00C2B817 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B6B355E91ED71FAD00C2B817 /* CASBatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CASBatch.h; path = Classes/CASBatch.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -72,17 +81,37 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B612D061242BD012005B41B7 /* CoreTelephony.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
B612D05F242BD012005B41B7 /* Frameworks */ = {
isa = PBXGroup;
children = (
B612D060242BD012005B41B7 /* CoreTelephony.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
B63E94C0242BCCE6001993B7 /* Reachability */ = {
isa = PBXGroup;
children = (
B63E94C1242BCCE6001993B7 /* CASReachability.h */,
B63E94C2242BCCE6001993B7 /* CASReachability.m */,
);
name = Reachability;
path = Classes/Reachability;
sourceTree = "<group>";
};
B6B355D21ED71D9600C2B817 = {
isa = PBXGroup;
children = (
B6B355DE1ED71D9700C2B817 /* Castle */,
B6B355DD1ED71D9700C2B817 /* Products */,
B612D05F242BD012005B41B7 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -111,11 +140,14 @@
B6B355F41ED71FAD00C2B817 /* CASRequestInterceptor.m */,
B6B355F51ED71FAD00C2B817 /* CASScreen.h */,
B6B355F61ED71FAD00C2B817 /* CASScreen.m */,
B63E94BC242BCCD1001993B7 /* CASContext.h */,
B63E94BD242BCCD1001993B7 /* CASContext.m */,
B6B355F71ED71FAD00C2B817 /* Client */,
B6B355FC1ED71FAD00C2B817 /* Public */,
B6B356011ED71FAD00C2B817 /* UIViewController+CASScreen.h */,
B6B356021ED71FAD00C2B817 /* UIViewController+CASScreen.m */,
B6B356031ED71FAD00C2B817 /* Util */,
B63E94C0242BCCE6001993B7 /* Reachability */,
B6B355E71ED71F9D00C2B817 /* Info.plist */,
);
path = Castle;
Expand Down Expand Up @@ -168,10 +200,12 @@
B6B356141ED71FAD00C2B817 /* CASAPIClient.h in Headers */,
B6B356101ED71FAD00C2B817 /* CASRequestInterceptor.h in Headers */,
B6B3560E1ED71FAD00C2B817 /* CASModel.h in Headers */,
B63E94C3242BCCE6001993B7 /* CASReachability.h in Headers */,
B6B356161ED71FAD00C2B817 /* CASEvent.h in Headers */,
B6B3560C1ED71FAD00C2B817 /* CASIdentity.h in Headers */,
B6B356081ED71FAD00C2B817 /* CASDevice.h in Headers */,
B6B356121ED71FAD00C2B817 /* CASScreen.h in Headers */,
B63E94BE242BCCD1001993B7 /* CASContext.h in Headers */,
B6B3561C1ED71FAD00C2B817 /* UIViewController+CASScreen.h in Headers */,
B6B356061ED71FAD00C2B817 /* CASBatch.h in Headers */,
B6B3560A1ED71FAD00C2B817 /* CASEventStorage.h in Headers */,
Expand Down Expand Up @@ -205,7 +239,7 @@
B6B355D31ED71D9600C2B817 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
LastUpgradeCheck = 1140;
ORGANIZATIONNAME = Castle;
TargetAttributes = {
B6B355DB1ED71D9700C2B817 = {
Expand All @@ -216,10 +250,11 @@
};
buildConfigurationList = B6B355D61ED71D9600C2B817 /* Build configuration list for PBXProject "Castle" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = B6B355D21ED71D9600C2B817;
productRefGroup = B6B355DD1ED71D9700C2B817 /* Products */;
Expand All @@ -236,7 +271,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B6B355E81ED71F9D00C2B817 /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -253,13 +287,15 @@
B6B356171ED71FAD00C2B817 /* CASEvent.m in Sources */,
B6B3561F1ED71FAD00C2B817 /* CASUtils.m in Sources */,
B6B3560D1ED71FAD00C2B817 /* CASIdentity.m in Sources */,
B63E94C4242BCCE6001993B7 /* CASReachability.m in Sources */,
B6B356071ED71FAD00C2B817 /* CASBatch.m in Sources */,
B6B3561D1ED71FAD00C2B817 /* UIViewController+CASScreen.m in Sources */,
B6B356151ED71FAD00C2B817 /* CASAPIClient.m in Sources */,
B6B356191ED71FAD00C2B817 /* Castle.m in Sources */,
B6B3561B1ED71FAD00C2B817 /* CastleConfiguration.m in Sources */,
B6B356131ED71FAD00C2B817 /* CASScreen.m in Sources */,
B6B356091ED71FAD00C2B817 /* CASDevice.m in Sources */,
B63E94BF242BCCD1001993B7 /* CASContext.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -276,15 +312,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -308,7 +352,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -328,15 +372,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -354,7 +406,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
6 changes: 1 addition & 5 deletions Castle.xcodeproj/xcshareddata/xcschemes/Castle.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:Castle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
3 changes: 2 additions & 1 deletion Castle/Classes/CASContext.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
// Created by Alexander Simson on 2018-02-12.
//

#import "CASContext.h"
#import <UIKit/UIKit.h>

#import "CASContext.h"
#import "CASReachability.h"
#import "Castle+Util.h"

Expand Down
1 change: 0 additions & 1 deletion Castle/Classes/Client/CASAPIClient.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#import <UIKit/UIKit.h>

#import "Castle.h"
#import "Castle+Util.h"
#import "CastleConfiguration.h"
#import "CASUtils.h"
#import "CASEvent.h"
Expand Down
3 changes: 2 additions & 1 deletion Castle/Classes/Util/CASUtils.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
// Copyright © 2017 Castle. All rights reserved.
//

#import "CASUtils.h"
#import <UIKit/UIKit.h>

#import "CASUtils.h"
#import "Castle.h"

static BOOL CastleDebugLoggingEnabled = NO;
Expand Down

0 comments on commit f0c94e1

Please sign in to comment.