Skip to content

Commit

Permalink
Merge pull request #83 from corinnekrych/AGIOS-490.cocoapods.1.x_for_…
Browse files Browse the repository at this point in the history 
…ObjC

Migrate to CocoaPods 1.0.1
  • Loading branch information
@corinnekrych
corinnekrych committed Sep 9, 2016
2 parents a664e15 + 130544a commit b5e5ade
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 154 deletions.
15 changes: 6 additions & 9 deletions .travis.yml
View file
@@ -1,16 +1,13 @@
language: objective-c

before_install:
- gem install cocoapods -v 0.33.1 --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty -v 0.1.6 --no-rdoc --no-ri --no-document --quiet

script:
- set -o pipefail && xcodebuild -workspace push-sdk.xcworkspace -scheme push-sdk -sdk iphonesimulator -configuration Release clean test | xcpretty -c
- pod spec lint AeroGear-Push.podspec --verbose
osx_image: xcode7.3
xcode_workspace: push-sdk.xcworkspace
xcode_scheme: push-sdk
xcode_sdk: iphonesimulator

notifications:
irc: "irc.freenode.org#aerogear"

branches:
only:
- master
- 1.x_dev
4 changes: 2 additions & 2 deletions Podfile
View file
@@ -1,8 +1,8 @@
xcodeproj 'push-sdk.xcodeproj'
project 'push-sdk.xcodeproj'

platform :ios, '7.0'

target 'pushsdkTests', :exclusive => true do
target 'pushsdkTests' do
pod 'Kiwi', '2.3.0'
pod 'OHHTTPStubs', '3.1.5'
end
156 changes: 13 additions & 143 deletions push-sdk.xcodeproj/project.pbxproj
View file
Expand Up @@ -18,11 +18,8 @@
48289C061B2EEE5D004AF471 /* AGPushAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289BFE1B2EEE5D004AF471 /* AGPushAnalytics.m */; };
48289C081B2EEE78004AF471 /* AGDeviceRegistrationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289C071B2EEE78004AF471 /* AGDeviceRegistrationSpec.m */; };
48289C0D1B2EF25C004AF471 /* AGPushAnalyticsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289C0C1B2EF25C004AF471 /* AGPushAnalyticsSpec.m */; };
48289C611B2F0859004AF471 /* AGClientDeviceInformationImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289BFA1B2EEE5D004AF471 /* AGClientDeviceInformationImpl.m */; };
48289C621B2F0859004AF471 /* AGDeviceRegistration.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289BFC1B2EEE5D004AF471 /* AGDeviceRegistration.m */; };
48289C631B2F0859004AF471 /* AGPushAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 48289BFE1B2EEE5D004AF471 /* AGPushAnalytics.m */; };
48AAA6E61C44FCFD0048C53A /* pushproperties.plist in Resources */ = {isa = PBXBuildFile; fileRef = 48AAA6E51C44FCFD0048C53A /* pushproperties.plist */; };
5C18F90CC0E512A66E4B5789 /* libPods-pushsdkTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 30277CD3D67E463A98C74ED2 /* libPods-pushsdkTests.a */; };
C5F720E63B09AB3F3EC28A1D /* libPods-pushsdkTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 07058CAD572171E918419C37 /* libPods-pushsdkTests.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -35,21 +32,8 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
48289C481B2F082A004AF471 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
30277CD3D67E463A98C74ED2 /* libPods-pushsdkTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-pushsdkTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3BFACB4DBB32DE6AB10BCA68 /* Pods-push-sdkTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-push-sdkTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-push-sdkTests/Pods-push-sdkTests.release.xcconfig"; sourceTree = "<group>"; };
07058CAD572171E918419C37 /* libPods-pushsdkTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-pushsdkTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
48289BDE1B2EEDF2004AF471 /* pushsdk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = pushsdk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
48289BE11B2EEDF2004AF471 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48289BE81B2EEDF2004AF471 /* pushsdkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pushsdkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -64,17 +48,11 @@
48289BFE1B2EEE5D004AF471 /* AGPushAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGPushAnalytics.m; sourceTree = "<group>"; };
48289C071B2EEE78004AF471 /* AGDeviceRegistrationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGDeviceRegistrationSpec.m; sourceTree = "<group>"; };
48289C0C1B2EF25C004AF471 /* AGPushAnalyticsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGPushAnalyticsSpec.m; sourceTree = "<group>"; };
48289C4A1B2F082A004AF471 /* libpush-sdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libpush-sdk.a"; sourceTree = BUILT_PRODUCTS_DIR; };
48AAA6E51C44FCFD0048C53A /* pushproperties.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = pushproperties.plist; sourceTree = "<group>"; };
5F8A96B5477848779F501C0A /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
690976179180479293B024D8 /* libPods-push-sdkTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-push-sdkTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6F53E2BA1768A935001966D8 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
8564B376890B868A05FBA59D /* Pods-push-sdkTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-push-sdkTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-push-sdkTests/Pods-push-sdkTests.debug.xcconfig"; sourceTree = "<group>"; };
881341938EC0FF4FED20F1A4 /* Pods-pushsdkTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pushsdkTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-pushsdkTests/Pods-pushsdkTests.debug.xcconfig"; sourceTree = "<group>"; };
99807EBAD8048D94D8FF85A9 /* Pods-pushsdkTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pushsdkTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-pushsdkTests/Pods-pushsdkTests.release.xcconfig"; sourceTree = "<group>"; };
A010C2E41737A58100CFA575 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
A010C2F31737A58100CFA575 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
A010C2F51737A58100CFA575 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
A010C30C1737A8F300CFA575 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
A010C30E1737A95A00CFA575 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
A03AC14217817BA300FF13A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand All @@ -93,14 +71,7 @@
buildActionMask = 2147483647;
files = (
48289BE91B2EEDF2004AF471 /* pushsdk.framework in Frameworks */,
5C18F90CC0E512A66E4B5789 /* libPods-pushsdkTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
48289C471B2F082A004AF471 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C5F720E63B09AB3F3EC28A1D /* libPods-pushsdkTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -110,8 +81,6 @@
26EAEE2BE45550C8D8056301 /* Pods */ = {
isa = PBXGroup;
children = (
8564B376890B868A05FBA59D /* Pods-push-sdkTests.debug.xcconfig */,
3BFACB4DBB32DE6AB10BCA68 /* Pods-push-sdkTests.release.xcconfig */,
881341938EC0FF4FED20F1A4 /* Pods-pushsdkTests.debug.xcconfig */,
99807EBAD8048D94D8FF85A9 /* Pods-pushsdkTests.release.xcconfig */,
);
Expand Down Expand Up @@ -177,7 +146,6 @@
children = (
48289BDE1B2EEDF2004AF471 /* pushsdk.framework */,
48289BE81B2EEDF2004AF471 /* pushsdkTests.xctest */,
48289C4A1B2F082A004AF471 /* libpush-sdk.a */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -190,11 +158,7 @@
A010C30E1737A95A00CFA575 /* SystemConfiguration.framework */,
A010C30C1737A8F300CFA575 /* MobileCoreServices.framework */,
A010C2E41737A58100CFA575 /* Foundation.framework */,
A010C2F31737A58100CFA575 /* SenTestingKit.framework */,
A010C2F51737A58100CFA575 /* UIKit.framework */,
5F8A96B5477848779F501C0A /* libPods.a */,
690976179180479293B024D8 /* libPods-push-sdkTests.a */,
30277CD3D67E463A98C74ED2 /* libPods-pushsdkTests.a */,
07058CAD572171E918419C37 /* libPods-pushsdkTests.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -239,12 +203,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 48289BF41B2EEDF2004AF471 /* Build configuration list for PBXNativeTarget "pushsdkTests" */;
buildPhases = (
B7633F66FC8250F770B9B313 /* Check Pods Manifest.lock */,
B7633F66FC8250F770B9B313 /* [CP] Check Pods Manifest.lock */,
48289BE41B2EEDF2004AF471 /* Sources */,
48289BE51B2EEDF2004AF471 /* Frameworks */,
48289BE61B2EEDF2004AF471 /* Resources */,
14A5211A3A2661B5D6FC2392 /* Copy Pods Resources */,
5F31A2BA7E9748675B67241D /* Embed Pods Frameworks */,
14A5211A3A2661B5D6FC2392 /* [CP] Copy Pods Resources */,
5F31A2BA7E9748675B67241D /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -256,23 +220,6 @@
productReference = 48289BE81B2EEDF2004AF471 /* pushsdkTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
48289C491B2F082A004AF471 /* push-sdk */ = {
isa = PBXNativeTarget;
buildConfigurationList = 48289C5F1B2F082A004AF471 /* Build configuration list for PBXNativeTarget "push-sdk" */;
buildPhases = (
48289C461B2F082A004AF471 /* Sources */,
48289C471B2F082A004AF471 /* Frameworks */,
48289C481B2F082A004AF471 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = "push-sdk";
productName = "push-sdk";
productReference = 48289C4A1B2F082A004AF471 /* libpush-sdk.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -288,9 +235,6 @@
48289BE71B2EEDF2004AF471 = {
CreatedOnToolsVersion = 6.3.2;
};
48289C491B2F082A004AF471 = {
CreatedOnToolsVersion = 6.3.2;
};
};
};
buildConfigurationList = A010C2DC1737A58100CFA575 /* Build configuration list for PBXProject "push-sdk" */;
Expand All @@ -307,7 +251,6 @@
targets = (
48289BDD1B2EEDF2004AF471 /* pushsdk */,
48289BE71B2EEDF2004AF471 /* pushsdkTests */,
48289C491B2F082A004AF471 /* push-sdk */,
);
};
/* End PBXProject section */
Expand All @@ -331,44 +274,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
14A5211A3A2661B5D6FC2392 /* Copy Pods Resources */ = {
14A5211A3A2661B5D6FC2392 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-pushsdkTests/Pods-pushsdkTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
5F31A2BA7E9748675B67241D /* Embed Pods Frameworks */ = {
5F31A2BA7E9748675B67241D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-pushsdkTests/Pods-pushsdkTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B7633F66FC8250F770B9B313 /* Check Pods Manifest.lock */ = {
B7633F66FC8250F770B9B313 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -398,16 +341,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
48289C461B2F082A004AF471 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
48289C611B2F0859004AF471 /* AGClientDeviceInformationImpl.m in Sources */,
48289C621B2F0859004AF471 /* AGDeviceRegistration.m in Sources */,
48289C631B2F0859004AF471 /* AGPushAnalytics.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand Down Expand Up @@ -567,60 +500,6 @@
};
name = Release;
};
48289C5B1B2F082A004AF471 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
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;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Debug;
};
48289C5C1B2F082A004AF471 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
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;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Release;
};
A010C3041737A58100CFA575 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -696,15 +575,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
48289C5F1B2F082A004AF471 /* Build configuration list for PBXNativeTarget "push-sdk" */ = {
isa = XCConfigurationList;
buildConfigurations = (
48289C5B1B2F082A004AF471 /* Debug */,
48289C5C1B2F082A004AF471 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
A010C2DC1737A58100CFA575 /* Build configuration list for PBXProject "push-sdk" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down

0 comments on commit b5e5ade

Please sign in to comment.