From 4944d2a57f17884211fca17234dc3a0b39f3cb9b Mon Sep 17 00:00:00 2001 From: henrik Date: Thu, 7 Feb 2019 16:11:28 +0100 Subject: [PATCH 1/3] Make Carthage compatible Added Xcode project and SEGAdjustIntegration.h had to be modified since Adjust is imported differently depending on if it is via Cocoapods or Carthage --- Cartfile | 2 + Cartfile.resolved | 2 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + Pod/Classes/SEGAdjustIntegration.h | 11 +- README.md | 7 + .../project.pbxproj | 378 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcschemes/SEGAdjustIntegration.xcscheme | 80 ++++ SEGAdjustIntegration/Info.plist | 22 + 10 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 Cartfile create mode 100644 Cartfile.resolved create mode 100644 Example/Segment-Adjust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SEGAdjustIntegration.xcodeproj/project.pbxproj create mode 100644 SEGAdjustIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 SEGAdjustIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SEGAdjustIntegration.xcodeproj/xcshareddata/xcschemes/SEGAdjustIntegration.xcscheme create mode 100644 SEGAdjustIntegration/Info.plist diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..80be8fa --- /dev/null +++ b/Cartfile @@ -0,0 +1,2 @@ +github "adjust/ios_sdk" +github "segmentio/analytics-ios" diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..d653433 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,2 @@ +github "adjust/ios_sdk" "v4.17.1" +github "segmentio/analytics-ios" "3.6.10" diff --git a/Example/Segment-Adjust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Segment-Adjust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/Segment-Adjust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Pod/Classes/SEGAdjustIntegration.h b/Pod/Classes/SEGAdjustIntegration.h index 28aebab..2ff8270 100644 --- a/Pod/Classes/SEGAdjustIntegration.h +++ b/Pod/Classes/SEGAdjustIntegration.h @@ -1,6 +1,15 @@ #import #import -#import + +#ifdef CARTHAGE_BUILD + /* This header is used for XCode & Carthage build because when using adjust + as a Carthage dependency it is imported as AdjustSDK/Adjust.h */ + #import +#else + /* This header is used for make build because when using adjust + as a cocoapods dependency it is imported as Adjust/Adjust.h */ + #import +#endif @interface SEGAdjustIntegration : NSObject diff --git a/README.md b/README.md index 0a895a9..b68ef43 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![CircleCI](https://circleci.com/gh/segment-integrations/analytics-ios-integration-adjust.svg?style=svg)](https://circleci.com/gh/segment-integrations/analytics-ios-integration-adjust) [![Version](https://img.shields.io/cocoapods/v/Segment-Adjust.svg?style=flat)](http://cocoapods.org/pods/Segment-Adjust) [![License](https://img.shields.io/cocoapods/l/Segment-Adjust.svg?style=flat)](http://cocoapods.org/pods/Segment-Adjust) +[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) Adjust integration for analytics-ios. @@ -14,6 +15,12 @@ To install the Segment-Adjust integration, simply add this line to your [CocoaPo pod "Segment-Adjust" ``` +Or add this to your [Carthage](https://github.com/Carthage/Carthage) `Cartfile`: + +```ruby +github "segment-integrations/analytics-ios-integration-adjust" +``` + ## Usage After adding the dependency, you must register the integration with our SDK. To do this, import the Adjust integration in your `AppDelegate`: diff --git a/SEGAdjustIntegration.xcodeproj/project.pbxproj b/SEGAdjustIntegration.xcodeproj/project.pbxproj new file mode 100644 index 0000000..bfd7eb8 --- /dev/null +++ b/SEGAdjustIntegration.xcodeproj/project.pbxproj @@ -0,0 +1,378 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + C38C3254220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = C38C324F220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h */; }; + C38C3257220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = C38C3252220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m */; }; + C38C3258220C6D3A00C77E2B /* SEGAdjustIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = C38C3253220C6D3A00C77E2B /* SEGAdjustIntegration.m */; }; + C38C325C220C6E9600C77E2B /* AdjustSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C38C325A220C6E9600C77E2B /* AdjustSdk.framework */; }; + C38C325D220C6E9600C77E2B /* Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C38C325B220C6E9600C77E2B /* Analytics.framework */; }; + C38C3260220C809E00C77E2B /* SEGAdjustIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = C38C3250220C6D3A00C77E2B /* SEGAdjustIntegration.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + C328EFC0220C6CCD0081F5A1 /* SEGAdjustIntegration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SEGAdjustIntegration.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C328EFC4220C6CCD0081F5A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C38C324F220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SEGAdjustIntegrationFactory.h; sourceTree = ""; }; + C38C3250220C6D3A00C77E2B /* SEGAdjustIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SEGAdjustIntegration.h; sourceTree = ""; }; + C38C3252220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SEGAdjustIntegrationFactory.m; sourceTree = ""; }; + C38C3253220C6D3A00C77E2B /* SEGAdjustIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SEGAdjustIntegration.m; sourceTree = ""; }; + C38C325A220C6E9600C77E2B /* AdjustSdk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdjustSdk.framework; path = Carthage/Build/iOS/AdjustSdk.framework; sourceTree = ""; }; + C38C325B220C6E9600C77E2B /* Analytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Analytics.framework; path = Carthage/Build/iOS/Analytics.framework; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + C328EFBD220C6CCC0081F5A1 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C38C325C220C6E9600C77E2B /* AdjustSdk.framework in Frameworks */, + C38C325D220C6E9600C77E2B /* Analytics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + C328EFB6220C6CCC0081F5A1 = { + isa = PBXGroup; + children = ( + C328EFC2220C6CCD0081F5A1 /* SEGAdjustIntegration */, + C328EFC1220C6CCD0081F5A1 /* Products */, + C38C324E220C6D3A00C77E2B /* Classes */, + C38C3259220C6E9600C77E2B /* Frameworks */, + ); + sourceTree = ""; + }; + C328EFC1220C6CCD0081F5A1 /* Products */ = { + isa = PBXGroup; + children = ( + C328EFC0220C6CCD0081F5A1 /* SEGAdjustIntegration.framework */, + ); + name = Products; + sourceTree = ""; + }; + C328EFC2220C6CCD0081F5A1 /* SEGAdjustIntegration */ = { + isa = PBXGroup; + children = ( + C328EFC4220C6CCD0081F5A1 /* Info.plist */, + ); + path = SEGAdjustIntegration; + sourceTree = ""; + }; + C38C324E220C6D3A00C77E2B /* Classes */ = { + isa = PBXGroup; + children = ( + C38C324F220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h */, + C38C3252220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m */, + C38C3250220C6D3A00C77E2B /* SEGAdjustIntegration.h */, + C38C3253220C6D3A00C77E2B /* SEGAdjustIntegration.m */, + ); + name = Classes; + path = Pod/Classes; + sourceTree = ""; + }; + C38C3259220C6E9600C77E2B /* Frameworks */ = { + isa = PBXGroup; + children = ( + C38C325A220C6E9600C77E2B /* AdjustSdk.framework */, + C38C325B220C6E9600C77E2B /* Analytics.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + C328EFBB220C6CCC0081F5A1 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C38C3260220C809E00C77E2B /* SEGAdjustIntegration.h in Headers */, + C38C3254220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + C328EFBF220C6CCC0081F5A1 /* SEGAdjustIntegration */ = { + isa = PBXNativeTarget; + buildConfigurationList = C328EFC8220C6CCD0081F5A1 /* Build configuration list for PBXNativeTarget "SEGAdjustIntegration" */; + buildPhases = ( + C328EFBB220C6CCC0081F5A1 /* Headers */, + C328EFBC220C6CCC0081F5A1 /* Sources */, + C328EFBD220C6CCC0081F5A1 /* Frameworks */, + C328EFBE220C6CCC0081F5A1 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SEGAdjustIntegration; + productName = SEGAdjustIntegration; + productReference = C328EFC0220C6CCD0081F5A1 /* SEGAdjustIntegration.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + C328EFB7220C6CCC0081F5A1 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1010; + ORGANIZATIONNAME = "Segment Integrations"; + TargetAttributes = { + C328EFBF220C6CCC0081F5A1 = { + CreatedOnToolsVersion = 10.1; + }; + }; + }; + buildConfigurationList = C328EFBA220C6CCC0081F5A1 /* Build configuration list for PBXProject "SEGAdjustIntegration" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = C328EFB6220C6CCC0081F5A1; + productRefGroup = C328EFC1220C6CCD0081F5A1 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + C328EFBF220C6CCC0081F5A1 /* SEGAdjustIntegration */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + C328EFBE220C6CCC0081F5A1 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + C328EFBC220C6CCC0081F5A1 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C38C3257220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m in Sources */, + C38C3258220C6D3A00C77E2B /* SEGAdjustIntegration.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + C328EFC6220C6CCD0081F5A1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = 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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + C328EFC7220C6CCD0081F5A1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = 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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + C328EFC9220C6CCD0081F5A1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + "CARTHAGE_BUILD=1", + ); + INFOPLIST_FILE = SEGAdjustIntegration/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.segment.SEGAdjustIntegration; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + C328EFCA220C6CCD0081F5A1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + GCC_PREPROCESSOR_DEFINITIONS = "CARTHAGE_BUILD=1"; + INFOPLIST_FILE = SEGAdjustIntegration/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.segment.SEGAdjustIntegration; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C328EFBA220C6CCC0081F5A1 /* Build configuration list for PBXProject "SEGAdjustIntegration" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C328EFC6220C6CCD0081F5A1 /* Debug */, + C328EFC7220C6CCD0081F5A1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C328EFC8220C6CCD0081F5A1 /* Build configuration list for PBXNativeTarget "SEGAdjustIntegration" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C328EFC9220C6CCD0081F5A1 /* Debug */, + C328EFCA220C6CCD0081F5A1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = C328EFB7220C6CCC0081F5A1 /* Project object */; +} diff --git a/SEGAdjustIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SEGAdjustIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..d488e9b --- /dev/null +++ b/SEGAdjustIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/SEGAdjustIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SEGAdjustIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SEGAdjustIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SEGAdjustIntegration.xcodeproj/xcshareddata/xcschemes/SEGAdjustIntegration.xcscheme b/SEGAdjustIntegration.xcodeproj/xcshareddata/xcschemes/SEGAdjustIntegration.xcscheme new file mode 100644 index 0000000..d2b1171 --- /dev/null +++ b/SEGAdjustIntegration.xcodeproj/xcshareddata/xcschemes/SEGAdjustIntegration.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SEGAdjustIntegration/Info.plist b/SEGAdjustIntegration/Info.plist new file mode 100644 index 0000000..e1fe4cf --- /dev/null +++ b/SEGAdjustIntegration/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + From ac8275bae1347304de761855a42e15f85227938b Mon Sep 17 00:00:00 2001 From: henrik Date: Thu, 7 Feb 2019 16:32:35 +0100 Subject: [PATCH 2/3] Added carthage preprocessor macro explanation --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b68ef43..344ccd0 100644 --- a/README.md +++ b/README.md @@ -9,18 +9,24 @@ Adjust integration for analytics-ios. ## Installation +### Cocoapods To install the Segment-Adjust integration, simply add this line to your [CocoaPods](http://cocoapods.org) `Podfile`: ```ruby pod "Segment-Adjust" ``` +### Carthage Or add this to your [Carthage](https://github.com/Carthage/Carthage) `Cartfile`: ```ruby github "segment-integrations/analytics-ios-integration-adjust" ``` +In the Xcode project, add a preprocessor macro `CARTHAGE_BUILD=1` to all targets and configurations. +This is necessary because Adjust uses different import statements depending on if it has been added +via Carthage or Cocoapods. + ## Usage After adding the dependency, you must register the integration with our SDK. To do this, import the Adjust integration in your `AppDelegate`: From b7c9b7b57773b91a764d4c7ed7770bbda81f7635 Mon Sep 17 00:00:00 2001 From: henrik Date: Thu, 7 Feb 2019 16:52:41 +0100 Subject: [PATCH 3/3] Make SEGAdjustIntegrationFactory.h public --- Pod/Classes/SEGAdjustIntegration.h | 1 + SEGAdjustIntegration.xcodeproj/project.pbxproj | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Pod/Classes/SEGAdjustIntegration.h b/Pod/Classes/SEGAdjustIntegration.h index 2ff8270..3776f99 100644 --- a/Pod/Classes/SEGAdjustIntegration.h +++ b/Pod/Classes/SEGAdjustIntegration.h @@ -1,5 +1,6 @@ #import #import +#import "SEGAdjustIntegrationFactory.h" #ifdef CARTHAGE_BUILD /* This header is used for XCode & Carthage build because when using adjust diff --git a/SEGAdjustIntegration.xcodeproj/project.pbxproj b/SEGAdjustIntegration.xcodeproj/project.pbxproj index bfd7eb8..d8896c2 100644 --- a/SEGAdjustIntegration.xcodeproj/project.pbxproj +++ b/SEGAdjustIntegration.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - C38C3254220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = C38C324F220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h */; }; + C38C3254220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = C38C324F220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38C3257220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = C38C3252220C6D3A00C77E2B /* SEGAdjustIntegrationFactory.m */; }; C38C3258220C6D3A00C77E2B /* SEGAdjustIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = C38C3253220C6D3A00C77E2B /* SEGAdjustIntegration.m */; }; C38C325C220C6E9600C77E2B /* AdjustSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C38C325A220C6E9600C77E2B /* AdjustSdk.framework */; }; @@ -209,6 +209,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -271,6 +272,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11;