diff --git a/Example/MRGPagerController.xcodeproj/project.pbxproj b/Example/MRGPagerController.xcodeproj/project.pbxproj index 3c4a0ed..e93f7f6 100644 --- a/Example/MRGPagerController.xcodeproj/project.pbxproj +++ b/Example/MRGPagerController.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 2F67171D090AF75272AFECE3 /* Pods_MRGPagerController_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 827571FA27ABA81B23AB7FAC /* Pods_MRGPagerController_Tests.framework */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; @@ -21,10 +22,10 @@ 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; 6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; }; 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; }; + A0F213DD705C66E581F121FA /* Pods_MRGPagerController_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A13C1D86F213898CADB640C2 /* Pods_MRGPagerController_Example.framework */; }; A66FA2E41BAB49E10030191E /* MRGDemoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A66FA2E11BAB49E10030191E /* MRGDemoController.m */; }; A66FA2E51BAB49E10030191E /* MRGDemoTabStrip.m in Sources */ = {isa = PBXBuildFile; fileRef = A66FA2E31BAB49E10030191E /* MRGDemoTabStrip.m */; }; - B4835D56EB6FB3ECF4DE7116 /* libPods-MRGPagerController_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F292957C357835A2FF3D49 /* libPods-MRGPagerController_Example.a */; }; - C04A347E95DA101BF8C561D6 /* libPods-MRGPagerController_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EAAC1BBB1D9E90A52376BB7 /* libPods-MRGPagerController_Tests.a */; }; + A6DF3B4D2074179F0020AC77 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A6DF3B4C2074179F0020AC77 /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -38,11 +39,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0E2707089FA096CF96E7507B /* Pods-MRGPagerController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig"; sourceTree = ""; }; - 1EAAC1BBB1D9E90A52376BB7 /* libPods-MRGPagerController_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MRGPagerController_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3201AC9BCE7F878B33788051 /* Pods-MRGPagerController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig"; sourceTree = ""; }; 3209C709C272C9AF5F7177FE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - 37E79EC0D5119B0F7D05B64C /* Pods-MRGPagerController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig"; sourceTree = ""; }; - 53F292957C357835A2FF3D49 /* libPods-MRGPagerController_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MRGPagerController_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58A195388D20070C39A /* MRGPagerController_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MRGPagerController_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -62,15 +60,19 @@ 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = ""; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; - 65000E4D79F7824E9EF0FAFE /* MRGPagerController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MRGPagerController.podspec; path = ../MRGPagerController.podspec; sourceTree = ""; }; + 65000E4D79F7824E9EF0FAFE /* MRGPagerController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MRGPagerController.podspec; path = ../MRGPagerController.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 80D98C6449B4B43DD92CB20B /* Pods-MRGPagerController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig"; sourceTree = ""; }; + 827571FA27ABA81B23AB7FAC /* Pods_MRGPagerController_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MRGPagerController_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - 9DAA98961F28061DEF953FDC /* Pods-MRGPagerController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig"; sourceTree = ""; }; + A13C1D86F213898CADB640C2 /* Pods_MRGPagerController_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MRGPagerController_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A66FA2E01BAB49E10030191E /* MRGDemoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRGDemoController.h; sourceTree = ""; }; A66FA2E11BAB49E10030191E /* MRGDemoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRGDemoController.m; sourceTree = ""; }; A66FA2E21BAB49E10030191E /* MRGDemoTabStrip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRGDemoTabStrip.h; sourceTree = ""; }; A66FA2E31BAB49E10030191E /* MRGDemoTabStrip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRGDemoTabStrip.m; sourceTree = ""; }; + A6DF3B4C2074179F0020AC77 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; D28AB28A0A80C5563F1F5BE1 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - EA0B7B6F27F27242F35D99B2 /* Pods-MRGPagerController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig"; sourceTree = ""; }; + E1532D89AEB2A60D4E8C4C96 /* Pods-MRGPagerController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig"; sourceTree = ""; }; + E8CABBF9F2BE3DB70BE630E0 /* Pods-MRGPagerController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MRGPagerController_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -81,7 +83,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - B4835D56EB6FB3ECF4DE7116 /* libPods-MRGPagerController_Example.a in Frameworks */, + A0F213DD705C66E581F121FA /* Pods_MRGPagerController_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -92,20 +94,20 @@ 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - C04A347E95DA101BF8C561D6 /* libPods-MRGPagerController_Tests.a in Frameworks */, + 2F67171D090AF75272AFECE3 /* Pods_MRGPagerController_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 44A36B306BE6F80CFFAE09A5 /* Pods */ = { + 02EBFDC5C446D3AE82C1755E /* Pods */ = { isa = PBXGroup; children = ( - 37E79EC0D5119B0F7D05B64C /* Pods-MRGPagerController_Example.debug.xcconfig */, - 9DAA98961F28061DEF953FDC /* Pods-MRGPagerController_Example.release.xcconfig */, - 0E2707089FA096CF96E7507B /* Pods-MRGPagerController_Tests.debug.xcconfig */, - EA0B7B6F27F27242F35D99B2 /* Pods-MRGPagerController_Tests.release.xcconfig */, + 80D98C6449B4B43DD92CB20B /* Pods-MRGPagerController_Example.debug.xcconfig */, + E1532D89AEB2A60D4E8C4C96 /* Pods-MRGPagerController_Example.release.xcconfig */, + 3201AC9BCE7F878B33788051 /* Pods-MRGPagerController_Tests.debug.xcconfig */, + E8CABBF9F2BE3DB70BE630E0 /* Pods-MRGPagerController_Tests.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -118,7 +120,7 @@ 6003F5B5195388D20070C39A /* Tests */, 6003F58C195388D20070C39A /* Frameworks */, 6003F58B195388D20070C39A /* Products */, - 44A36B306BE6F80CFFAE09A5 /* Pods */, + 02EBFDC5C446D3AE82C1755E /* Pods */, ); sourceTree = ""; }; @@ -138,8 +140,8 @@ 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, 6003F5AF195388D20070C39A /* XCTest.framework */, - 53F292957C357835A2FF3D49 /* libPods-MRGPagerController_Example.a */, - 1EAAC1BBB1D9E90A52376BB7 /* libPods-MRGPagerController_Tests.a */, + A13C1D86F213898CADB640C2 /* Pods_MRGPagerController_Example.framework */, + 827571FA27ABA81B23AB7FAC /* Pods_MRGPagerController_Tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -147,6 +149,9 @@ 6003F593195388D20070C39A /* Example for MRGPagerController */ = { isa = PBXGroup; children = ( + 6003F5A8195388D20070C39A /* Images.xcassets */, + A6DF3B4C2074179F0020AC77 /* LaunchScreen.storyboard */, + 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */, 6003F59C195388D20070C39A /* MRGAppDelegate.h */, 6003F59D195388D20070C39A /* MRGAppDelegate.m */, A66FA2E01BAB49E10030191E /* MRGDemoController.h */, @@ -155,8 +160,6 @@ A66FA2E31BAB49E10030191E /* MRGDemoTabStrip.m */, 6003F5A5195388D20070C39A /* MRGViewController.h */, 6003F5A6195388D20070C39A /* MRGViewController.m */, - 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */, - 6003F5A8195388D20070C39A /* Images.xcassets */, 6003F594195388D20070C39A /* Supporting Files */, ); name = "Example for MRGPagerController"; @@ -210,12 +213,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "MRGPagerController_Example" */; buildPhases = ( - 3BADDC49FD893B6A03C542B4 /* Check Pods Manifest.lock */, + 7AAB427E6DDAFFA8A5B96EB0 /* [CP] Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - C72539E39B7F40DC64B24B6C /* Copy Pods Resources */, - F628742A706A4AB69307DE79 /* Embed Pods Frameworks */, + 6DBED4CD6A1F675AB49CC878 /* [CP] Embed Pods Frameworks */, + 66BECCF3D9D13E1BCDCD82AD /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -230,12 +233,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "MRGPagerController_Tests" */; buildPhases = ( - 967368FFFC4FD310BD8E274C /* Check Pods Manifest.lock */, + A286848203B3498E2E34A93E /* [CP] Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - 066DD0FAF16D9ECEC3995887 /* Copy Pods Resources */, - 51AE364A9B66EF163B515DCF /* Embed Pods Frameworks */, + 488818E19855D2BD67B7BF91 /* [CP] Embed Pods Frameworks */, + 6981CDE622541E589191EB3C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -254,10 +257,14 @@ isa = PBXProject; attributes = { CLASSPREFIX = MRG; - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = Mirego; TargetAttributes = { + 6003F589195388D20070C39A = { + DevelopmentTeam = 4Q596JWQC5; + }; 6003F5AD195388D20070C39A = { + DevelopmentTeam = 4Q596JWQC5; TestTargetID = 6003F589195388D20070C39A; }; }; @@ -287,6 +294,7 @@ buildActionMask = 2147483647; files = ( 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */, + A6DF3B4D2074179F0020AC77 /* LaunchScreen.storyboard in Resources */, 6003F5A9195388D20070C39A /* Images.xcassets in Resources */, 6003F598195388D20070C39A /* InfoPlist.strings in Resources */, ); @@ -303,94 +311,103 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 066DD0FAF16D9ECEC3995887 /* Copy Pods Resources */ = { + 488818E19855D2BD67B7BF91 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 3BADDC49FD893B6A03C542B4 /* Check Pods Manifest.lock */ = { + 66BECCF3D9D13E1BCDCD82AD /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 51AE364A9B66EF163B515DCF /* Embed Pods Frameworks */ = { + 6981CDE622541E589191EB3C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 967368FFFC4FD310BD8E274C /* Check Pods Manifest.lock */ = { + 6DBED4CD6A1F675AB49CC878 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/MRGPagerController/MRGPagerController.framework", ); - name = "Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MRGPagerController.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C72539E39B7F40DC64B24B6C /* Copy Pods Resources */ = { + 7AAB427E6DDAFFA8A5B96EB0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MRGPagerController_Example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F628742A706A4AB69307DE79 /* Embed Pods Frameworks */ = { + A286848203B3498E2E34A93E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "Embed Pods Frameworks"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MRGPagerController_Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -454,32 +471,46 @@ 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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_TREAT_WARNINGS_AS_ERRORS = 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 = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -494,25 +525,39 @@ 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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = 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 = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -521,15 +566,16 @@ }; 6003F5C0195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 37E79EC0D5119B0F7D05B64C /* Pods-MRGPagerController_Example.debug.xcconfig */; + baseConfigurationReference = 80D98C6449B4B43DD92CB20B /* Pods-MRGPagerController_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + DEVELOPMENT_TEAM = 4Q596JWQC5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MRGPagerController/MRGPagerController-Prefix.pch"; INFOPLIST_FILE = "MRGPagerController/MRGPagerController-Info.plist"; MODULE_NAME = ExampleApp; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.MRGPagerController-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -537,15 +583,16 @@ }; 6003F5C1195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9DAA98961F28061DEF953FDC /* Pods-MRGPagerController_Example.release.xcconfig */; + baseConfigurationReference = E1532D89AEB2A60D4E8C4C96 /* Pods-MRGPagerController_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + DEVELOPMENT_TEAM = 4Q596JWQC5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MRGPagerController/MRGPagerController-Prefix.pch"; INFOPLIST_FILE = "MRGPagerController/MRGPagerController-Info.plist"; MODULE_NAME = ExampleApp; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.MRGPagerController-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -553,9 +600,10 @@ }; 6003F5C3195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0E2707089FA096CF96E7507B /* Pods-MRGPagerController_Tests.debug.xcconfig */; + baseConfigurationReference = 3201AC9BCE7F878B33788051 /* Pods-MRGPagerController_Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + DEVELOPMENT_TEAM = 4Q596JWQC5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -572,9 +620,10 @@ }; 6003F5C4195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EA0B7B6F27F27242F35D99B2 /* Pods-MRGPagerController_Tests.release.xcconfig */; + baseConfigurationReference = E8CABBF9F2BE3DB70BE630E0 /* Pods-MRGPagerController_Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + DEVELOPMENT_TEAM = 4Q596JWQC5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; INFOPLIST_FILE = "Tests/Tests-Info.plist"; diff --git a/Example/MRGPagerController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/MRGPagerController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/MRGPagerController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/MRGPagerController.xcodeproj/xcshareddata/xcschemes/MRGPagerController_Example.xcscheme b/Example/MRGPagerController.xcodeproj/xcshareddata/xcschemes/MRGPagerController_Example.xcscheme index e938ae7..1805211 100644 --- a/Example/MRGPagerController.xcodeproj/xcshareddata/xcschemes/MRGPagerController_Example.xcscheme +++ b/Example/MRGPagerController.xcodeproj/xcshareddata/xcschemes/MRGPagerController_Example.xcscheme @@ -1,6 +1,6 @@ + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/MRGPagerController/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/MRGPagerController/Images.xcassets/AppIcon.appiconset/Contents.json index 36d2c80..d8db8d6 100644 --- a/Example/MRGPagerController/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/MRGPagerController/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -59,6 +79,16 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Example/MRGPagerController/LaunchScreen.storyboard b/Example/MRGPagerController/LaunchScreen.storyboard new file mode 100644 index 0000000..cd783c1 --- /dev/null +++ b/Example/MRGPagerController/LaunchScreen.storyboard @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/MRGPagerController/MRGAppDelegate.h b/Example/MRGPagerController/MRGAppDelegate.h index 0be816d..3ab0f5a 100644 --- a/Example/MRGPagerController/MRGAppDelegate.h +++ b/Example/MRGPagerController/MRGAppDelegate.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/MRGPagerController/MRGAppDelegate.m b/Example/MRGPagerController/MRGAppDelegate.m index 7d8d333..402942c 100644 --- a/Example/MRGPagerController/MRGAppDelegate.m +++ b/Example/MRGPagerController/MRGAppDelegate.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/MRGPagerController/MRGDemoController.h b/Example/MRGPagerController/MRGDemoController.h index 313cb96..1d15d0b 100644 --- a/Example/MRGPagerController/MRGDemoController.h +++ b/Example/MRGPagerController/MRGDemoController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,4 +30,4 @@ @interface MRGDemoController : UIViewController - (instancetype)initWithTitle:(NSString *)title text:(NSString *)text; -@end \ No newline at end of file +@end diff --git a/Example/MRGPagerController/MRGDemoController.m b/Example/MRGPagerController/MRGDemoController.m index fd036c3..194e1f1 100644 --- a/Example/MRGPagerController/MRGDemoController.m +++ b/Example/MRGPagerController/MRGDemoController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -53,4 +53,4 @@ - (void)loadView { self.view = label; } -@end \ No newline at end of file +@end diff --git a/Example/MRGPagerController/MRGDemoTabStrip.h b/Example/MRGPagerController/MRGDemoTabStrip.h index e1b284c..73a690b 100644 --- a/Example/MRGPagerController/MRGDemoTabStrip.h +++ b/Example/MRGPagerController/MRGDemoTabStrip.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/MRGPagerController/MRGDemoTabStrip.m b/Example/MRGPagerController/MRGDemoTabStrip.m index 6bcb4d4..556c543 100644 --- a/Example/MRGPagerController/MRGDemoTabStrip.m +++ b/Example/MRGPagerController/MRGDemoTabStrip.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/MRGPagerController/MRGPagerController-Info.plist b/Example/MRGPagerController/MRGPagerController-Info.plist index b06b79c..7576a0d 100644 --- a/Example/MRGPagerController/MRGPagerController-Info.plist +++ b/Example/MRGPagerController/MRGPagerController-Info.plist @@ -24,6 +24,8 @@ 1.0 LSRequiresIPhoneOS + UILaunchStoryboardName + LaunchScreen UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/Example/MRGPagerController/MRGViewController.h b/Example/MRGPagerController/MRGViewController.h index 3d48c4a..a0ef1dd 100644 --- a/Example/MRGPagerController/MRGViewController.h +++ b/Example/MRGPagerController/MRGViewController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/MRGPagerController/MRGViewController.m b/Example/MRGPagerController/MRGViewController.m index a2875c1..b1c0bfc 100644 --- a/Example/MRGPagerController/MRGViewController.m +++ b/Example/MRGPagerController/MRGViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ @implementation MRGViewController - (void)viewDidLoad { [super viewDidLoad]; - + self.pagerController = [[MRGPagerController alloc] initWithPagerStripClass:[MRGDemoTabStrip class]]; [self addChildViewController:self.pagerController]; @@ -55,19 +55,20 @@ - (void)viewDidLoad } - (void)configurePager { - - NSArray *tabs = @[ - [[MRGDemoController alloc] initWithTitle:@"1" text:@"1"], - [[MRGDemoController alloc] initWithTitle:@"2" text:@"2"], - [[MRGDemoController alloc] initWithTitle:@"3" text:@"3"], - [[MRGDemoController alloc] initWithTitle:@"4" text:@"4"], - [[MRGDemoController alloc] initWithTitle:@"5" text:@"5"], - [[MRGDemoController alloc] initWithTitle:@"6" text:@"6"], - [[MRGDemoController alloc] initWithTitle:@"7" text:@"7"], - [[MRGDemoController alloc] initWithTitle:@"8" text:@"8"], - [[MRGDemoController alloc] initWithTitle:@"9" text:@"9"] - ]; - + + NSArray *tabs = + @[ + [[MRGDemoController alloc] initWithTitle:@"1" text:@"1"], + [[MRGDemoController alloc] initWithTitle:@"2" text:@"2"], + [[MRGDemoController alloc] initWithTitle:@"3" text:@"3"], + [[MRGDemoController alloc] initWithTitle:@"4" text:@"4"], + [[MRGDemoController alloc] initWithTitle:@"5" text:@"5"], + [[MRGDemoController alloc] initWithTitle:@"6" text:@"6"], + [[MRGDemoController alloc] initWithTitle:@"7" text:@"7"], + [[MRGDemoController alloc] initWithTitle:@"8" text:@"8"], + [[MRGDemoController alloc] initWithTitle:@"9" text:@"9"] + ]; + self.pagerController.viewControllers = tabs; self.pagerController.currentViewController = tabs[7]; } diff --git a/Example/MRGPagerController/Main.storyboard b/Example/MRGPagerController/Main.storyboard index 63d8f02..439e83d 100644 --- a/Example/MRGPagerController/Main.storyboard +++ b/Example/MRGPagerController/Main.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -10,14 +14,13 @@ - - + + - + - - + diff --git a/Example/MRGPagerController/main.m b/Example/MRGPagerController/main.m index ef94a7a..02a7c51 100644 --- a/Example/MRGPagerController/main.m +++ b/Example/MRGPagerController/main.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Example/Podfile b/Example/Podfile index b91c060..8215525 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,11 +1,10 @@ -source 'https://github.com/CocoaPods/Specs.git' +platform :ios, '8.0' +use_frameworks! -target 'MRGPagerController_Example', :exclusive => true do - pod "MRGPagerController", :path => "../" -end - -target 'MRGPagerController_Tests', :exclusive => true do - pod "MRGPagerController", :path => "../" +target 'MRGPagerController_Example' do + pod 'MRGPagerController', :path => '../' - + target 'MRGPagerController_Tests' do + inherit! :search_paths + end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 6082976..e817e6e 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,14 +1,16 @@ PODS: - - MRGPagerController (1.0.9) + - MRGPagerController (1.1) DEPENDENCIES: - MRGPagerController (from `../`) EXTERNAL SOURCES: MRGPagerController: - :path: "../" + :path: ../ SPEC CHECKSUMS: - MRGPagerController: 5ba303b0df5d7523c85a19aa48e5a1f2deb8cd60 + MRGPagerController: ec70b0866720042fa60de78e918434e97d77c09a -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 54ade33a80857e981cd8868bdb60abcb692be0fc + +COCOAPODS: 1.4.0 diff --git a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerController.h b/Example/Pods/Headers/Private/MRGPagerController/MRGPagerController.h deleted file mode 120000 index cf3e8b8..0000000 --- a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerController.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerController.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerStrip.h b/Example/Pods/Headers/Private/MRGPagerController/MRGPagerStrip.h deleted file mode 120000 index 091bba8..0000000 --- a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerStrip.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTabStrip.h b/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTabStrip.h deleted file mode 120000 index 1db4af5..0000000 --- a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTabStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerTabStrip.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTitleStrip.h b/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTitleStrip.h deleted file mode 120000 index b2ab3e4..0000000 --- a/Example/Pods/Headers/Private/MRGPagerController/MRGPagerTitleStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerTitleStrip.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerController.h b/Example/Pods/Headers/Public/MRGPagerController/MRGPagerController.h deleted file mode 120000 index cf3e8b8..0000000 --- a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerController.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerController.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerStrip.h b/Example/Pods/Headers/Public/MRGPagerController/MRGPagerStrip.h deleted file mode 120000 index 091bba8..0000000 --- a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerStrip.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTabStrip.h b/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTabStrip.h deleted file mode 120000 index 1db4af5..0000000 --- a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTabStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerTabStrip.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTitleStrip.h b/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTitleStrip.h deleted file mode 120000 index b2ab3e4..0000000 --- a/Example/Pods/Headers/Public/MRGPagerController/MRGPagerTitleStrip.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/MRGPagerTitleStrip.h \ No newline at end of file diff --git a/Example/Pods/Local Podspecs/MRGPagerController.podspec.json b/Example/Pods/Local Podspecs/MRGPagerController.podspec.json index e4fdb7e..5e14deb 100644 --- a/Example/Pods/Local Podspecs/MRGPagerController.podspec.json +++ b/Example/Pods/Local Podspecs/MRGPagerController.podspec.json @@ -1,6 +1,6 @@ { "name": "MRGPagerController", - "version": "1.0.9", + "version": "1.1", "summary": "An highly customizable pager controller.", "homepage": "https://github.com/Mirego/MRGPagerController", "license": "BSD 3-Clause", @@ -9,13 +9,12 @@ }, "source": { "git": "https://github.com/Mirego/MRGPagerController.git", - "tag": "1.0.9" + "tag": "1.1" }, "social_media_url": "https://twitter.com/Mirego", "requires_arc": true, "source_files": "Pod/Classes", "platforms": { - "ios": "7.0", - "tvos": "9.0" + "ios": "8.0" } } diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 6082976..e817e6e 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,14 +1,16 @@ PODS: - - MRGPagerController (1.0.9) + - MRGPagerController (1.1) DEPENDENCIES: - MRGPagerController (from `../`) EXTERNAL SOURCES: MRGPagerController: - :path: "../" + :path: ../ SPEC CHECKSUMS: - MRGPagerController: 5ba303b0df5d7523c85a19aa48e5a1f2deb8cd60 + MRGPagerController: ec70b0866720042fa60de78e918434e97d77c09a -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 54ade33a80857e981cd8868bdb60abcb692be0fc + +COCOAPODS: 1.4.0 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 24f5fb4..4298566 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,292 +7,322 @@ objects = { /* Begin PBXBuildFile section */ - 039B6AE3282F6B7DEA8CB424ADB6C66A /* MRGPagerTabStrip.m in Sources */ = {isa = PBXBuildFile; fileRef = 49C70C84A38FDB0CC3785DEBCB590D4D /* MRGPagerTabStrip.m */; }; - 323DEED703194C955C7FF3BBC61F375B /* MRGPagerTabStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = 313CF8BE40E5145C95EE81D1F9203837 /* MRGPagerTabStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 34F01ABBA13D3DB2A4EA47B0B729702C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E4E89230EF59BC255123B67864ACF77 /* Foundation.framework */; }; - 364524302ACD961DDB8076496C6D047A /* Pods-MRGPagerController_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 190D7AB5D904F5F89B458B88C62F977D /* Pods-MRGPagerController_Example-dummy.m */; }; - 3C2D1CE29393E98FCF8F447768A90D5E /* MRGPagerTitleStrip.m in Sources */ = {isa = PBXBuildFile; fileRef = 511D069D8CE80808205BF214B9257568 /* MRGPagerTitleStrip.m */; }; - 423A413715A14FA6F8EF0A22C5B07F7F /* MRGPagerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 12DCC8A1A447A2EF9C1A6830D43F2A89 /* MRGPagerController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 443A70104793F8571BFF43DDAD58B6B3 /* Pods-MRGPagerController_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C06F0157D17F6BDBD040F6ADE8ACB8 /* Pods-MRGPagerController_Tests-dummy.m */; }; - 475021264A3ECA4EE850D252276FD1B9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E4E89230EF59BC255123B67864ACF77 /* Foundation.framework */; }; - 61601A86F1780FDFF89F0DAAE75B6B4B /* MRGPagerController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9839978E5C199C30DF9F93685377D9B6 /* MRGPagerController-dummy.m */; }; - 74156364B60CC42AF3EE5C3482C76F6F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E4E89230EF59BC255123B67864ACF77 /* Foundation.framework */; }; - 7EA7DAFAB78CA47CDA16A35D2AE16C7F /* MRGPagerTitleStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = AB08F290897D013FC307CAB5C03AD088 /* MRGPagerTitleStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8C79EB123E4AE1055B64F01F3C5D2714 /* MRGPagerStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = 99BCDDBD9B3EC91437C57B54B58C8418 /* MRGPagerStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E86A993B2D5BBF255DFB1DE7C131E7ED /* MRGPagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A269B40B64C6D2BEEF72077A36CD22 /* MRGPagerController.m */; }; + 26AFDDEC3AE5B48A759CD79FC1E9F565 /* MRGPagerStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B38352C78AE687FEC10893A06DC5D04 /* MRGPagerStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 35845CBCF0E3CB6FFAB08B031F929A79 /* MRGPagerTitleStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = D6FA992ED193935A55E125076769AABB /* MRGPagerTitleStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 36D003FC4EEE6AB76589DFA2409DEC11 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 3C6494A143317DD5F7723CD9938E1DCC /* MRGPagerTabStrip.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8B02331420DBE30AB1C0EC5D9F2D91 /* MRGPagerTabStrip.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 407E919EE59BE02A914A8740364AD6B7 /* Pods-MRGPagerController_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E212E741371F6AA2FFAB62B9CAC53D9C /* Pods-MRGPagerController_Tests-dummy.m */; }; + 4527711FDA0350F048D86819AF370C5B /* MRGPagerController-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6395C51AFB51569CA347C765D0ADC6 /* MRGPagerController-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47BE4AFB05620D5193661B1528961369 /* MRGPagerTabStrip.m in Sources */ = {isa = PBXBuildFile; fileRef = 76CDCC33DB3D0910CC0B4E9C3AF5F17E /* MRGPagerTabStrip.m */; }; + 488D714CE0278993B1131F1413002205 /* Pods-MRGPagerController_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E64FC995D6C34520AC8884D393A4579F /* Pods-MRGPagerController_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7FB7C0EA2D9DE02616FC9A851CF26484 /* MRGPagerController.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E6BE66AA2B5031583BBC2D89012E73 /* MRGPagerController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9BA9B5BABFF550114724FFF6B7713DD2 /* MRGPagerController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D8B98A036E4683D87BC9CDB2AE92FC /* MRGPagerController-dummy.m */; }; + 9E5361FCB1D0106638A803FFDB5FC3AC /* Pods-MRGPagerController_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 787F50BCC146998FBC0022F79DE1B930 /* Pods-MRGPagerController_Example-dummy.m */; }; + BF9C178D8039DD517506C07185F00DDD /* MRGPagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 318054586E967975AAEA49A0245B2701 /* MRGPagerController.m */; }; + C7DED562A0CF892453EC1B2556E35889 /* MRGPagerTitleStrip.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8E47155EC3DE64BDF47CCDA121F783 /* MRGPagerTitleStrip.m */; }; + D17956F4712BC8D33ED471A94536A909 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + DFCF6A1DE3E621108064B80D21AFA27F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + E8B53D8BC83BF2AF436FB5CD20774209 /* Pods-MRGPagerController_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D7EB4C126A4200F99138AF6EF390F5D4 /* Pods-MRGPagerController_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 9D534CC3B00077E9C2499BD69DF1A0C6 /* PBXContainerItemProxy */ = { + 5A35CE66B8D8ACE74F55CC745F68B320 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 66F1C21F1E93A364A7427FB739D1D1A7; - remoteInfo = MRGPagerController; - }; - FD016504F449ACEF36162E425A9230BB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; - proxyType = 1; - remoteGlobalIDString = 66F1C21F1E93A364A7427FB739D1D1A7; + remoteGlobalIDString = 2025FC5E44FC56DBCA2D536BD46E470F; remoteInfo = MRGPagerController; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 12DCC8A1A447A2EF9C1A6830D43F2A89 /* MRGPagerController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MRGPagerController.h; sourceTree = ""; }; - 17C06F0157D17F6BDBD040F6ADE8ACB8 /* Pods-MRGPagerController_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MRGPagerController_Tests-dummy.m"; sourceTree = ""; }; - 190D7AB5D904F5F89B458B88C62F977D /* Pods-MRGPagerController_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MRGPagerController_Example-dummy.m"; sourceTree = ""; }; - 1ED4F36450319573E4CBCA250C704AC8 /* Pods-MRGPagerController_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MRGPagerController_Tests-acknowledgements.plist"; sourceTree = ""; }; - 313CF8BE40E5145C95EE81D1F9203837 /* MRGPagerTabStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MRGPagerTabStrip.h; sourceTree = ""; }; - 3E4E89230EF59BC255123B67864ACF77 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 48A269B40B64C6D2BEEF72077A36CD22 /* MRGPagerController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MRGPagerController.m; sourceTree = ""; }; - 49C70C84A38FDB0CC3785DEBCB590D4D /* MRGPagerTabStrip.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MRGPagerTabStrip.m; sourceTree = ""; }; - 511D069D8CE80808205BF214B9257568 /* MRGPagerTitleStrip.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MRGPagerTitleStrip.m; sourceTree = ""; }; - 527F79496E2B13D691CC2C009075F4D6 /* Pods-MRGPagerController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Tests.debug.xcconfig"; sourceTree = ""; }; - 593053A754CA5FD7891EB0F6C473B7B6 /* MRGPagerController-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MRGPagerController-prefix.pch"; sourceTree = ""; }; - 644A1DD6402460C244750400D2C66454 /* Pods-MRGPagerController_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Tests-frameworks.sh"; sourceTree = ""; }; - 6698FF24ECF403AD8048E627BB777CF6 /* MRGPagerController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MRGPagerController.xcconfig; sourceTree = ""; }; - 741EB32212EB29656DD15AE1E8F104DA /* Pods-MRGPagerController_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Tests-resources.sh"; sourceTree = ""; }; - 792D6BE0751F2A61D4ED01DD5117D08C /* Pods-MRGPagerController_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MRGPagerController_Tests-acknowledgements.markdown"; sourceTree = ""; }; - 7C28459666D0ADCDD1AEBED354A3E043 /* libPods-MRGPagerController_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MRGPagerController_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7CEF0A531F1935996F881C3A8CA9EBBD /* Pods-MRGPagerController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Example.debug.xcconfig"; sourceTree = ""; }; - 88F8D0219797138196F13716770384AB /* libPods-MRGPagerController_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MRGPagerController_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 964255F1FC71F9061F423CE705A424F5 /* libMRGPagerController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMRGPagerController.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 9659E068A33506BFD6E7AEBF36ED9FC9 /* Pods-MRGPagerController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Example.release.xcconfig"; sourceTree = ""; }; - 9839978E5C199C30DF9F93685377D9B6 /* MRGPagerController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MRGPagerController-dummy.m"; sourceTree = ""; }; - 99BCDDBD9B3EC91437C57B54B58C8418 /* MRGPagerStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MRGPagerStrip.h; sourceTree = ""; }; - AB08F290897D013FC307CAB5C03AD088 /* MRGPagerTitleStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MRGPagerTitleStrip.h; sourceTree = ""; }; - ACB5DB66C2B86E717CFCD4E1FD7621A1 /* Pods-MRGPagerController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Tests.release.xcconfig"; sourceTree = ""; }; - B83E849DA5315914F975B36947D4AA37 /* Pods-MRGPagerController_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Example-resources.sh"; sourceTree = ""; }; - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - BD2F413383288B479E4E949604D2C79E /* Pods-MRGPagerController_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Example-frameworks.sh"; sourceTree = ""; }; - CE43550971F67E5A9895D72CAACAB7C9 /* Pods-MRGPagerController_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MRGPagerController_Example-acknowledgements.markdown"; sourceTree = ""; }; - DB2E51232F82A83039868DFAF2A541E3 /* Pods-MRGPagerController_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MRGPagerController_Example-acknowledgements.plist"; sourceTree = ""; }; + 01E72E01477440E4469CF66160AF2C59 /* Pods-MRGPagerController_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MRGPagerController_Tests.modulemap"; sourceTree = ""; }; + 04CF5682500C889ECDDF11B5F04917B3 /* MRGPagerController.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MRGPagerController.modulemap; sourceTree = ""; }; + 1A0F84AC6A126F805AD569394DA74D2F /* Pods-MRGPagerController_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MRGPagerController_Tests-acknowledgements.plist"; sourceTree = ""; }; + 20EE1457B1D88F978B00EB990452BDFA /* Pods-MRGPagerController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Tests.debug.xcconfig"; sourceTree = ""; }; + 281F6FFD48E7C483093EB5726E88EDCC /* Pods-MRGPagerController_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MRGPagerController_Example-acknowledgements.markdown"; sourceTree = ""; }; + 3015BE53C42C4DB9E6190224314FBD7F /* Pods-MRGPagerController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Example.debug.xcconfig"; sourceTree = ""; }; + 318054586E967975AAEA49A0245B2701 /* MRGPagerController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MRGPagerController.m; path = Pod/Classes/MRGPagerController.m; sourceTree = ""; }; + 39029363FCC3C94C7184B9451D9F0DAB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 3E6395C51AFB51569CA347C765D0ADC6 /* MRGPagerController-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MRGPagerController-umbrella.h"; sourceTree = ""; }; + 4694B6B45E51BF0F48B75C441AD2C0D9 /* Pods-MRGPagerController_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MRGPagerController_Example.modulemap"; sourceTree = ""; }; + 517044A0D367F26459AD69BB96145A50 /* Pods-MRGPagerController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Example.release.xcconfig"; sourceTree = ""; }; + 59ACF1FB41A5C92C8C83CDC371554062 /* Pods-MRGPagerController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MRGPagerController_Tests.release.xcconfig"; sourceTree = ""; }; + 5CDD59DE337D060445879BCA68222AEB /* MRGPagerController-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MRGPagerController-prefix.pch"; sourceTree = ""; }; + 60622588FDEA423A4BDB976C69DC4BCE /* MRGPagerController.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = MRGPagerController.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 6B38352C78AE687FEC10893A06DC5D04 /* MRGPagerStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRGPagerStrip.h; path = Pod/Classes/MRGPagerStrip.h; sourceTree = ""; }; + 71D4AA6E285B92AC5790C2B6F1F6CB7F /* Pods-MRGPagerController_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Tests-frameworks.sh"; sourceTree = ""; }; + 76CDCC33DB3D0910CC0B4E9C3AF5F17E /* MRGPagerTabStrip.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MRGPagerTabStrip.m; path = Pod/Classes/MRGPagerTabStrip.m; sourceTree = ""; }; + 787F50BCC146998FBC0022F79DE1B930 /* Pods-MRGPagerController_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MRGPagerController_Example-dummy.m"; sourceTree = ""; }; + 83B414BD4D71190517C51C5F5FE29199 /* Pods-MRGPagerController_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Example-resources.sh"; sourceTree = ""; }; + 8B8E47155EC3DE64BDF47CCDA121F783 /* MRGPagerTitleStrip.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MRGPagerTitleStrip.m; path = Pod/Classes/MRGPagerTitleStrip.m; sourceTree = ""; }; + 8DDDDFA06B719E18051D04DCB1E2C259 /* MRGPagerController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MRGPagerController.xcconfig; sourceTree = ""; }; + 92733E3AC84C09A907430E0257320374 /* Pods-MRGPagerController_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MRGPagerController_Example-acknowledgements.plist"; sourceTree = ""; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 96D8B98A036E4683D87BC9CDB2AE92FC /* MRGPagerController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MRGPagerController-dummy.m"; sourceTree = ""; }; + 9B48461C7F7AE879F529C805B2FD3A40 /* Pods-MRGPagerController_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Tests-resources.sh"; sourceTree = ""; }; + 9DC9EBB9F5257D9C0F903047EBC2C043 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + A680AC095692D660220FE2FFF8EC1081 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + BD5D633129B47B37C9D232C8AA1A41AC /* Pods-MRGPagerController_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MRGPagerController_Example-frameworks.sh"; sourceTree = ""; }; + C4E6BE66AA2B5031583BBC2D89012E73 /* MRGPagerController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRGPagerController.h; path = Pod/Classes/MRGPagerController.h; sourceTree = ""; }; + C9E4BEC6DC7DD30D2C191AC30764909D /* Pods_MRGPagerController_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MRGPagerController_Tests.framework; path = "Pods-MRGPagerController_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + D4BBB46A994E52E4BB5423FF916EF27F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D6FA992ED193935A55E125076769AABB /* MRGPagerTitleStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRGPagerTitleStrip.h; path = Pod/Classes/MRGPagerTitleStrip.h; sourceTree = ""; }; + D7EB4C126A4200F99138AF6EF390F5D4 /* Pods-MRGPagerController_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MRGPagerController_Example-umbrella.h"; sourceTree = ""; }; + DA8B02331420DBE30AB1C0EC5D9F2D91 /* MRGPagerTabStrip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRGPagerTabStrip.h; path = Pod/Classes/MRGPagerTabStrip.h; sourceTree = ""; }; + E212E741371F6AA2FFAB62B9CAC53D9C /* Pods-MRGPagerController_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MRGPagerController_Tests-dummy.m"; sourceTree = ""; }; + E5099A7440AF2FB087836ABB0C86AB7E /* MRGPagerController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MRGPagerController.framework; path = MRGPagerController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E64FC995D6C34520AC8884D393A4579F /* Pods-MRGPagerController_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MRGPagerController_Tests-umbrella.h"; sourceTree = ""; }; + F017F0B102885E270E7F8D925FA0CE8D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + F76F553622307874D620B698046E8BF7 /* Pods_MRGPagerController_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MRGPagerController_Example.framework; path = "Pods-MRGPagerController_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + FB83828E4D91E50F7125DCAC53DE5A9A /* Pods-MRGPagerController_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MRGPagerController_Tests-acknowledgements.markdown"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 54B1D08BE08B2F6C5A8046288A221761 /* Frameworks */ = { + 772839A10C38D36DD339A19750FDC05F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 74156364B60CC42AF3EE5C3482C76F6F /* Foundation.framework in Frameworks */, + 36D003FC4EEE6AB76589DFA2409DEC11 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D38D6B2194A61CBE2004A7ECECA84B76 /* Frameworks */ = { + 9D3C6D6798526BA5103C21CFCC690BA3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 34F01ABBA13D3DB2A4EA47B0B729702C /* Foundation.framework in Frameworks */, + DFCF6A1DE3E621108064B80D21AFA27F /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - E298064236008208043C5C1CA7DE060F /* Frameworks */ = { + C8338F83302AA127E1A54673C94A71D0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 475021264A3ECA4EE850D252276FD1B9 /* Foundation.framework in Frameworks */, + D17956F4712BC8D33ED471A94536A909 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 38255ED0860DB0DA0C8DA70CD21BC42A /* Classes */ = { + 1A9001255B6A84A53A02A7B2B59BD2CC /* MRGPagerController */ = { isa = PBXGroup; children = ( - 12DCC8A1A447A2EF9C1A6830D43F2A89 /* MRGPagerController.h */, - 48A269B40B64C6D2BEEF72077A36CD22 /* MRGPagerController.m */, - 99BCDDBD9B3EC91437C57B54B58C8418 /* MRGPagerStrip.h */, - 313CF8BE40E5145C95EE81D1F9203837 /* MRGPagerTabStrip.h */, - 49C70C84A38FDB0CC3785DEBCB590D4D /* MRGPagerTabStrip.m */, - AB08F290897D013FC307CAB5C03AD088 /* MRGPagerTitleStrip.h */, - 511D069D8CE80808205BF214B9257568 /* MRGPagerTitleStrip.m */, - ); - path = Classes; + C4E6BE66AA2B5031583BBC2D89012E73 /* MRGPagerController.h */, + 318054586E967975AAEA49A0245B2701 /* MRGPagerController.m */, + 6B38352C78AE687FEC10893A06DC5D04 /* MRGPagerStrip.h */, + DA8B02331420DBE30AB1C0EC5D9F2D91 /* MRGPagerTabStrip.h */, + 76CDCC33DB3D0910CC0B4E9C3AF5F17E /* MRGPagerTabStrip.m */, + D6FA992ED193935A55E125076769AABB /* MRGPagerTitleStrip.h */, + 8B8E47155EC3DE64BDF47CCDA121F783 /* MRGPagerTitleStrip.m */, + 6DE66F76BB14B5C51D2082977A40E836 /* Pod */, + 86ADAF0370BC6DE79C44665DF009C7C0 /* Support Files */, + ); + name = MRGPagerController; + path = ../..; sourceTree = ""; }; - 4EAFA5E31BC474AC607B84A99CE1BCF7 /* Support Files */ = { + 305297E54D2C3312F6ED2050EA439A96 /* Targets Support Files */ = { isa = PBXGroup; children = ( - 6698FF24ECF403AD8048E627BB777CF6 /* MRGPagerController.xcconfig */, - 9839978E5C199C30DF9F93685377D9B6 /* MRGPagerController-dummy.m */, - 593053A754CA5FD7891EB0F6C473B7B6 /* MRGPagerController-prefix.pch */, + 9B397E6B6A18656050DEBAA771C5E410 /* Pods-MRGPagerController_Example */, + 8400618658BD35BFE300D8AE1401DEEC /* Pods-MRGPagerController_Tests */, ); - name = "Support Files"; - path = "Example/Pods/Target Support Files/MRGPagerController"; + name = "Targets Support Files"; sourceTree = ""; }; - 53B95BD61422B83B4BEF26D03099EB70 /* Pods-MRGPagerController_Tests */ = { + 324E18C9D3A6E66C82E75A17F12395C7 /* Products */ = { isa = PBXGroup; children = ( - 792D6BE0751F2A61D4ED01DD5117D08C /* Pods-MRGPagerController_Tests-acknowledgements.markdown */, - 1ED4F36450319573E4CBCA250C704AC8 /* Pods-MRGPagerController_Tests-acknowledgements.plist */, - 17C06F0157D17F6BDBD040F6ADE8ACB8 /* Pods-MRGPagerController_Tests-dummy.m */, - 644A1DD6402460C244750400D2C66454 /* Pods-MRGPagerController_Tests-frameworks.sh */, - 741EB32212EB29656DD15AE1E8F104DA /* Pods-MRGPagerController_Tests-resources.sh */, - 527F79496E2B13D691CC2C009075F4D6 /* Pods-MRGPagerController_Tests.debug.xcconfig */, - ACB5DB66C2B86E717CFCD4E1FD7621A1 /* Pods-MRGPagerController_Tests.release.xcconfig */, + E5099A7440AF2FB087836ABB0C86AB7E /* MRGPagerController.framework */, + F76F553622307874D620B698046E8BF7 /* Pods_MRGPagerController_Example.framework */, + C9E4BEC6DC7DD30D2C191AC30764909D /* Pods_MRGPagerController_Tests.framework */, ); - name = "Pods-MRGPagerController_Tests"; - path = "Target Support Files/Pods-MRGPagerController_Tests"; + name = Products; sourceTree = ""; }; - 57A5F309B37894E0E86B6698FDE5A6DC /* Development Pods */ = { + 6DE66F76BB14B5C51D2082977A40E836 /* Pod */ = { isa = PBXGroup; children = ( - A9BC0F4CEFAA44A5AF00A0B546449A0C /* MRGPagerController */, + 9DC9EBB9F5257D9C0F903047EBC2C043 /* LICENSE */, + 60622588FDEA423A4BDB976C69DC4BCE /* MRGPagerController.podspec */, + 39029363FCC3C94C7184B9451D9F0DAB /* README.md */, ); - name = "Development Pods"; + name = Pod; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */, - 57A5F309B37894E0E86B6698FDE5A6DC /* Development Pods */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, + B03E4F7FF2861943379AAEEFEE35A02E /* Development Pods */, BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, - EE6DBA8FDED50AE6B7750C466D2B5E1B /* Products */, - F4F9D5C632A954889A3EDACF4AF12252 /* Targets Support Files */, - ); - sourceTree = ""; - }; - A9BC0F4CEFAA44A5AF00A0B546449A0C /* MRGPagerController */ = { - isa = PBXGroup; - children = ( - BCC7E5C67C2A932D8A978AB2D1B3D60F /* Pod */, - 4EAFA5E31BC474AC607B84A99CE1BCF7 /* Support Files */, + 324E18C9D3A6E66C82E75A17F12395C7 /* Products */, + 305297E54D2C3312F6ED2050EA439A96 /* Targets Support Files */, ); - name = MRGPagerController; - path = ../..; sourceTree = ""; }; - B99406BE181CB8AFE55839E84C2ABDB7 /* Pods-MRGPagerController_Example */ = { + 8400618658BD35BFE300D8AE1401DEEC /* Pods-MRGPagerController_Tests */ = { isa = PBXGroup; children = ( - CE43550971F67E5A9895D72CAACAB7C9 /* Pods-MRGPagerController_Example-acknowledgements.markdown */, - DB2E51232F82A83039868DFAF2A541E3 /* Pods-MRGPagerController_Example-acknowledgements.plist */, - 190D7AB5D904F5F89B458B88C62F977D /* Pods-MRGPagerController_Example-dummy.m */, - BD2F413383288B479E4E949604D2C79E /* Pods-MRGPagerController_Example-frameworks.sh */, - B83E849DA5315914F975B36947D4AA37 /* Pods-MRGPagerController_Example-resources.sh */, - 7CEF0A531F1935996F881C3A8CA9EBBD /* Pods-MRGPagerController_Example.debug.xcconfig */, - 9659E068A33506BFD6E7AEBF36ED9FC9 /* Pods-MRGPagerController_Example.release.xcconfig */, + D4BBB46A994E52E4BB5423FF916EF27F /* Info.plist */, + 01E72E01477440E4469CF66160AF2C59 /* Pods-MRGPagerController_Tests.modulemap */, + FB83828E4D91E50F7125DCAC53DE5A9A /* Pods-MRGPagerController_Tests-acknowledgements.markdown */, + 1A0F84AC6A126F805AD569394DA74D2F /* Pods-MRGPagerController_Tests-acknowledgements.plist */, + E212E741371F6AA2FFAB62B9CAC53D9C /* Pods-MRGPagerController_Tests-dummy.m */, + 71D4AA6E285B92AC5790C2B6F1F6CB7F /* Pods-MRGPagerController_Tests-frameworks.sh */, + 9B48461C7F7AE879F529C805B2FD3A40 /* Pods-MRGPagerController_Tests-resources.sh */, + E64FC995D6C34520AC8884D393A4579F /* Pods-MRGPagerController_Tests-umbrella.h */, + 20EE1457B1D88F978B00EB990452BDFA /* Pods-MRGPagerController_Tests.debug.xcconfig */, + 59ACF1FB41A5C92C8C83CDC371554062 /* Pods-MRGPagerController_Tests.release.xcconfig */, ); - name = "Pods-MRGPagerController_Example"; - path = "Target Support Files/Pods-MRGPagerController_Example"; + name = "Pods-MRGPagerController_Tests"; + path = "Target Support Files/Pods-MRGPagerController_Tests"; sourceTree = ""; }; - BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { + 86ADAF0370BC6DE79C44665DF009C7C0 /* Support Files */ = { isa = PBXGroup; children = ( - BF6342C8B29F4CEEA088EFF7AB4DE362 /* iOS */, + A680AC095692D660220FE2FFF8EC1081 /* Info.plist */, + 04CF5682500C889ECDDF11B5F04917B3 /* MRGPagerController.modulemap */, + 8DDDDFA06B719E18051D04DCB1E2C259 /* MRGPagerController.xcconfig */, + 96D8B98A036E4683D87BC9CDB2AE92FC /* MRGPagerController-dummy.m */, + 5CDD59DE337D060445879BCA68222AEB /* MRGPagerController-prefix.pch */, + 3E6395C51AFB51569CA347C765D0ADC6 /* MRGPagerController-umbrella.h */, ); - name = Frameworks; + name = "Support Files"; + path = "Example/Pods/Target Support Files/MRGPagerController"; sourceTree = ""; }; - BCC7E5C67C2A932D8A978AB2D1B3D60F /* Pod */ = { + 9B397E6B6A18656050DEBAA771C5E410 /* Pods-MRGPagerController_Example */ = { isa = PBXGroup; children = ( - 38255ED0860DB0DA0C8DA70CD21BC42A /* Classes */, + F017F0B102885E270E7F8D925FA0CE8D /* Info.plist */, + 4694B6B45E51BF0F48B75C441AD2C0D9 /* Pods-MRGPagerController_Example.modulemap */, + 281F6FFD48E7C483093EB5726E88EDCC /* Pods-MRGPagerController_Example-acknowledgements.markdown */, + 92733E3AC84C09A907430E0257320374 /* Pods-MRGPagerController_Example-acknowledgements.plist */, + 787F50BCC146998FBC0022F79DE1B930 /* Pods-MRGPagerController_Example-dummy.m */, + BD5D633129B47B37C9D232C8AA1A41AC /* Pods-MRGPagerController_Example-frameworks.sh */, + 83B414BD4D71190517C51C5F5FE29199 /* Pods-MRGPagerController_Example-resources.sh */, + D7EB4C126A4200F99138AF6EF390F5D4 /* Pods-MRGPagerController_Example-umbrella.h */, + 3015BE53C42C4DB9E6190224314FBD7F /* Pods-MRGPagerController_Example.debug.xcconfig */, + 517044A0D367F26459AD69BB96145A50 /* Pods-MRGPagerController_Example.release.xcconfig */, ); - path = Pod; + name = "Pods-MRGPagerController_Example"; + path = "Target Support Files/Pods-MRGPagerController_Example"; sourceTree = ""; }; - BF6342C8B29F4CEEA088EFF7AB4DE362 /* iOS */ = { + B03E4F7FF2861943379AAEEFEE35A02E /* Development Pods */ = { isa = PBXGroup; children = ( - 3E4E89230EF59BC255123B67864ACF77 /* Foundation.framework */, + 1A9001255B6A84A53A02A7B2B59BD2CC /* MRGPagerController */, ); - name = iOS; + name = "Development Pods"; sourceTree = ""; }; - EE6DBA8FDED50AE6B7750C466D2B5E1B /* Products */ = { + BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { isa = PBXGroup; children = ( - 964255F1FC71F9061F423CE705A424F5 /* libMRGPagerController.a */, - 88F8D0219797138196F13716770384AB /* libPods-MRGPagerController_Example.a */, - 7C28459666D0ADCDD1AEBED354A3E043 /* libPods-MRGPagerController_Tests.a */, + D35AF013A5F0BAD4F32504907A52519E /* iOS */, ); - name = Products; + name = Frameworks; sourceTree = ""; }; - F4F9D5C632A954889A3EDACF4AF12252 /* Targets Support Files */ = { + D35AF013A5F0BAD4F32504907A52519E /* iOS */ = { isa = PBXGroup; children = ( - B99406BE181CB8AFE55839E84C2ABDB7 /* Pods-MRGPagerController_Example */, - 53B95BD61422B83B4BEF26D03099EB70 /* Pods-MRGPagerController_Tests */, + 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */, ); - name = "Targets Support Files"; + name = iOS; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - A8769189F6E970405EE9F6250387B080 /* Headers */ = { + 184F2B8FDB1D59856B6755B287874BC3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 4527711FDA0350F048D86819AF370C5B /* MRGPagerController-umbrella.h in Headers */, + 7FB7C0EA2D9DE02616FC9A851CF26484 /* MRGPagerController.h in Headers */, + 26AFDDEC3AE5B48A759CD79FC1E9F565 /* MRGPagerStrip.h in Headers */, + 3C6494A143317DD5F7723CD9938E1DCC /* MRGPagerTabStrip.h in Headers */, + 35845CBCF0E3CB6FFAB08B031F929A79 /* MRGPagerTitleStrip.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23F738C38C0E345D47683D4939E3DB33 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 423A413715A14FA6F8EF0A22C5B07F7F /* MRGPagerController.h in Headers */, - 8C79EB123E4AE1055B64F01F3C5D2714 /* MRGPagerStrip.h in Headers */, - 323DEED703194C955C7FF3BBC61F375B /* MRGPagerTabStrip.h in Headers */, - 7EA7DAFAB78CA47CDA16A35D2AE16C7F /* MRGPagerTitleStrip.h in Headers */, + E8B53D8BC83BF2AF436FB5CD20774209 /* Pods-MRGPagerController_Example-umbrella.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C323671CA4CF41D41F2085C43CC4A8FE /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 488D714CE0278993B1131F1413002205 /* Pods-MRGPagerController_Tests-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 182CDD791FC925FF27E596BDBA2AF386 /* Pods-MRGPagerController_Example */ = { + 2025FC5E44FC56DBCA2D536BD46E470F /* MRGPagerController */ = { isa = PBXNativeTarget; - buildConfigurationList = 918098C63FE79B5EF136161B5232E3EE /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Example" */; + buildConfigurationList = 273EC798C320C12148C94B61F1C3A526 /* Build configuration list for PBXNativeTarget "MRGPagerController" */; buildPhases = ( - 05FB18E65D60703F1F0F5A874576DF6B /* Sources */, - D38D6B2194A61CBE2004A7ECECA84B76 /* Frameworks */, + CC62DDB4DB613548EA10A4DCF4955E63 /* Sources */, + C8338F83302AA127E1A54673C94A71D0 /* Frameworks */, + 184F2B8FDB1D59856B6755B287874BC3 /* Headers */, ); buildRules = ( ); dependencies = ( - 12205E8663F0F7095CA4BD9C9BFBF0AB /* PBXTargetDependency */, ); - name = "Pods-MRGPagerController_Example"; - productName = "Pods-MRGPagerController_Example"; - productReference = 88F8D0219797138196F13716770384AB /* libPods-MRGPagerController_Example.a */; - productType = "com.apple.product-type.library.static"; + name = MRGPagerController; + productName = MRGPagerController; + productReference = E5099A7440AF2FB087836ABB0C86AB7E /* MRGPagerController.framework */; + productType = "com.apple.product-type.framework"; }; - 26D460BA5FFADE78C8A368382578C539 /* Pods-MRGPagerController_Tests */ = { + CA68CE4DAE3C4E022DD0E4D8F12D0D23 /* Pods-MRGPagerController_Example */ = { isa = PBXNativeTarget; - buildConfigurationList = 458B5B6FE06F3963EC446B2AC09375C3 /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Tests" */; + buildConfigurationList = 3AB949B8A16EA7D8C7A65CB512B8B31E /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Example" */; buildPhases = ( - 9DE6FCA8B5FF627480238C8C6B9F6EFB /* Sources */, - E298064236008208043C5C1CA7DE060F /* Frameworks */, + 821CDA0FFCA1D8E4FDAD8F938A2B279D /* Sources */, + 772839A10C38D36DD339A19750FDC05F /* Frameworks */, + 23F738C38C0E345D47683D4939E3DB33 /* Headers */, ); buildRules = ( ); dependencies = ( - 7152A73C6BCC612DED6799FBC1ECB95E /* PBXTargetDependency */, + 513E4301AA8CC159BD71C8CC3EA0BB63 /* PBXTargetDependency */, ); - name = "Pods-MRGPagerController_Tests"; - productName = "Pods-MRGPagerController_Tests"; - productReference = 7C28459666D0ADCDD1AEBED354A3E043 /* libPods-MRGPagerController_Tests.a */; - productType = "com.apple.product-type.library.static"; + name = "Pods-MRGPagerController_Example"; + productName = "Pods-MRGPagerController_Example"; + productReference = F76F553622307874D620B698046E8BF7 /* Pods_MRGPagerController_Example.framework */; + productType = "com.apple.product-type.framework"; }; - 66F1C21F1E93A364A7427FB739D1D1A7 /* MRGPagerController */ = { + DCEC6C7639C7E097FDE7087E9A10CDF2 /* Pods-MRGPagerController_Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 0B55F074CD2AC35A17C1DFE85CFC1EFC /* Build configuration list for PBXNativeTarget "MRGPagerController" */; + buildConfigurationList = BF7D5613A7380CD386A9605C914ACE31 /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Tests" */; buildPhases = ( - F8A16F91049D55B44FFD91F4046201F3 /* Sources */, - 54B1D08BE08B2F6C5A8046288A221761 /* Frameworks */, - A8769189F6E970405EE9F6250387B080 /* Headers */, + 5AC6C7C322089D29985F6F4915E51DD0 /* Sources */, + 9D3C6D6798526BA5103C21CFCC690BA3 /* Frameworks */, + C323671CA4CF41D41F2085C43CC4A8FE /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = MRGPagerController; - productName = MRGPagerController; - productReference = 964255F1FC71F9061F423CE705A424F5 /* libMRGPagerController.a */; - productType = "com.apple.product-type.library.static"; + name = "Pods-MRGPagerController_Tests"; + productName = "Pods-MRGPagerController_Tests"; + productReference = C9E4BEC6DC7DD30D2C191AC30764909D /* Pods_MRGPagerController_Tests.framework */; + productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -300,8 +330,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -311,248 +341,375 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = EE6DBA8FDED50AE6B7750C466D2B5E1B /* Products */; + productRefGroup = 324E18C9D3A6E66C82E75A17F12395C7 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 66F1C21F1E93A364A7427FB739D1D1A7 /* MRGPagerController */, - 182CDD791FC925FF27E596BDBA2AF386 /* Pods-MRGPagerController_Example */, - 26D460BA5FFADE78C8A368382578C539 /* Pods-MRGPagerController_Tests */, + 2025FC5E44FC56DBCA2D536BD46E470F /* MRGPagerController */, + CA68CE4DAE3C4E022DD0E4D8F12D0D23 /* Pods-MRGPagerController_Example */, + DCEC6C7639C7E097FDE7087E9A10CDF2 /* Pods-MRGPagerController_Tests */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 05FB18E65D60703F1F0F5A874576DF6B /* Sources */ = { + 5AC6C7C322089D29985F6F4915E51DD0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 364524302ACD961DDB8076496C6D047A /* Pods-MRGPagerController_Example-dummy.m in Sources */, + 407E919EE59BE02A914A8740364AD6B7 /* Pods-MRGPagerController_Tests-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 9DE6FCA8B5FF627480238C8C6B9F6EFB /* Sources */ = { + 821CDA0FFCA1D8E4FDAD8F938A2B279D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 443A70104793F8571BFF43DDAD58B6B3 /* Pods-MRGPagerController_Tests-dummy.m in Sources */, + 9E5361FCB1D0106638A803FFDB5FC3AC /* Pods-MRGPagerController_Example-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - F8A16F91049D55B44FFD91F4046201F3 /* Sources */ = { + CC62DDB4DB613548EA10A4DCF4955E63 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61601A86F1780FDFF89F0DAAE75B6B4B /* MRGPagerController-dummy.m in Sources */, - E86A993B2D5BBF255DFB1DE7C131E7ED /* MRGPagerController.m in Sources */, - 039B6AE3282F6B7DEA8CB424ADB6C66A /* MRGPagerTabStrip.m in Sources */, - 3C2D1CE29393E98FCF8F447768A90D5E /* MRGPagerTitleStrip.m in Sources */, + 9BA9B5BABFF550114724FFF6B7713DD2 /* MRGPagerController-dummy.m in Sources */, + BF9C178D8039DD517506C07185F00DDD /* MRGPagerController.m in Sources */, + 47BE4AFB05620D5193661B1528961369 /* MRGPagerTabStrip.m in Sources */, + C7DED562A0CF892453EC1B2556E35889 /* MRGPagerTitleStrip.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 12205E8663F0F7095CA4BD9C9BFBF0AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = MRGPagerController; - target = 66F1C21F1E93A364A7427FB739D1D1A7 /* MRGPagerController */; - targetProxy = FD016504F449ACEF36162E425A9230BB /* PBXContainerItemProxy */; - }; - 7152A73C6BCC612DED6799FBC1ECB95E /* PBXTargetDependency */ = { + 513E4301AA8CC159BD71C8CC3EA0BB63 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = MRGPagerController; - target = 66F1C21F1E93A364A7427FB739D1D1A7 /* MRGPagerController */; - targetProxy = 9D534CC3B00077E9C2499BD69DF1A0C6 /* PBXContainerItemProxy */; + target = 2025FC5E44FC56DBCA2D536BD46E470F /* MRGPagerController */; + targetProxy = 5A35CE66B8D8ACE74F55CC745F68B320 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 03CA91998D6773EC5D02B3DB87B8353E /* Release */ = { + 0C57CF62023EA57664F67598A9AD7A8D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8DDDDFA06B719E18051D04DCB1E2C259 /* MRGPagerController.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/MRGPagerController/MRGPagerController-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/MRGPagerController/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/MRGPagerController/MRGPagerController.modulemap"; + PRODUCT_NAME = MRGPagerController; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 65E6975FB37DFEB5F4B7DB689FD33985 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3015BE53C42C4DB9E6190224314FBD7F /* Pods-MRGPagerController_Example.debug.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MRGPagerController_Example/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_MRGPagerController_Example; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 886C0397F45B1B04131DF9A6C872E8F8 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8DDDDFA06B719E18051D04DCB1E2C259 /* MRGPagerController.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/MRGPagerController/MRGPagerController-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/MRGPagerController/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/MRGPagerController/MRGPagerController.modulemap"; + PRODUCT_NAME = MRGPagerController; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + AEA860E118E23C471BBDBA33BBF18941 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 20EE1457B1D88F978B00EB990452BDFA /* Pods-MRGPagerController_Tests.debug.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MRGPagerController_Tests/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_MRGPagerController_Tests; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + C3E37FB098AE76440E29106ADBF00CEB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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_DIRECT_OBJC_ISA_USAGE = 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_OBJC_ROOT_CLASS = 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; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + 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 = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; - name = Release; + name = Debug; }; - 0B57334D6C23DADAA4F7D802A5760EB2 /* Debug */ = { + DA03565BE765DB55C6448FB363A44481 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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_DIRECT_OBJC_ISA_USAGE = 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_OBJC_ROOT_CLASS = 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_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; + 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_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", + "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - ONLY_ACTIVE_ARCH = YES; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; - 43FA409A3E65769EEA1BBE82316DA3B3 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7CEF0A531F1935996F881C3A8CA9EBBD /* Pods-MRGPagerController_Example.debug.xcconfig */; - buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - MACH_O_TYPE = staticlib; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - 66E2EACD4FCA73A13A344F58C98C2187 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 527F79496E2B13D691CC2C009075F4D6 /* Pods-MRGPagerController_Tests.debug.xcconfig */; - buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - MACH_O_TYPE = staticlib; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - 6C9B1C565E4AEBCF405C03B7A34C9121 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 6698FF24ECF403AD8048E627BB777CF6 /* MRGPagerController.xcconfig */; - buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_PREFIX_HEADER = "Target Support Files/MRGPagerController/MRGPagerController-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; }; name = Release; }; - 8ADBC088C5F42791A7DFA49F7783AD24 /* Release */ = { + F2A061983A28A80B62200E7829387F3B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9659E068A33506BFD6E7AEBF36ED9FC9 /* Pods-MRGPagerController_Example.release.xcconfig */; + baseConfigurationReference = 517044A0D367F26459AD69BB96145A50 /* Pods-MRGPagerController_Example.release.xcconfig */; buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MRGPagerController_Example/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MTL_ENABLE_DEBUG_INFO = NO; + MODULEMAP_FILE = "Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_MRGPagerController_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; name = Release; }; - A43186A45179BD78DA5D3EA8FC5C1892 /* Debug */ = { + FA62AED3018A2AEA687D46745A63388C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6698FF24ECF403AD8048E627BB777CF6 /* MRGPagerController.xcconfig */; + baseConfigurationReference = 59ACF1FB41A5C92C8C83CDC371554062 /* Pods-MRGPagerController_Tests.release.xcconfig */; buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_PREFIX_HEADER = "Target Support Files/MRGPagerController/MRGPagerController-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - DC9EDFDED1D33B3F1BFE2F82C56BEA0C /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = ACB5DB66C2B86E717CFCD4E1FD7621A1 /* Pods-MRGPagerController_Tests.release.xcconfig */; - buildSettings = { - ENABLE_STRICT_OBJC_MSGSEND = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MRGPagerController_Tests/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MTL_ENABLE_DEBUG_INFO = NO; + MODULEMAP_FILE = "Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_MRGPagerController_Tests; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0B55F074CD2AC35A17C1DFE85CFC1EFC /* Build configuration list for PBXNativeTarget "MRGPagerController" */ = { + 273EC798C320C12148C94B61F1C3A526 /* Build configuration list for PBXNativeTarget "MRGPagerController" */ = { isa = XCConfigurationList; buildConfigurations = ( - A43186A45179BD78DA5D3EA8FC5C1892 /* Debug */, - 6C9B1C565E4AEBCF405C03B7A34C9121 /* Release */, + 886C0397F45B1B04131DF9A6C872E8F8 /* Debug */, + 0C57CF62023EA57664F67598A9AD7A8D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -560,26 +717,26 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0B57334D6C23DADAA4F7D802A5760EB2 /* Debug */, - 03CA91998D6773EC5D02B3DB87B8353E /* Release */, + C3E37FB098AE76440E29106ADBF00CEB /* Debug */, + DA03565BE765DB55C6448FB363A44481 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 458B5B6FE06F3963EC446B2AC09375C3 /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Tests" */ = { + 3AB949B8A16EA7D8C7A65CB512B8B31E /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 66E2EACD4FCA73A13A344F58C98C2187 /* Debug */, - DC9EDFDED1D33B3F1BFE2F82C56BEA0C /* Release */, + 65E6975FB37DFEB5F4B7DB689FD33985 /* Debug */, + F2A061983A28A80B62200E7829387F3B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 918098C63FE79B5EF136161B5232E3EE /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Example" */ = { + BF7D5613A7380CD386A9605C914ACE31 /* Build configuration list for PBXNativeTarget "Pods-MRGPagerController_Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 43FA409A3E65769EEA1BBE82316DA3B3 /* Debug */, - 8ADBC088C5F42791A7DFA49F7783AD24 /* Release */, + AEA860E118E23C471BBDBA33BBF18941 /* Debug */, + FA62AED3018A2AEA687D46745A63388C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MRGPagerController.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MRGPagerController.xcscheme deleted file mode 100644 index 5a06a9a..0000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MRGPagerController.xcscheme +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/Target Support Files/MRGPagerController/Info.plist b/Example/Pods/Target Support Files/MRGPagerController/Info.plist new file mode 100644 index 0000000..21a30b4 --- /dev/null +++ b/Example/Pods/Target Support Files/MRGPagerController/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.1.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-prefix.pch b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-prefix.pch index aa992a4..beb2a24 100644 --- a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-prefix.pch +++ b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-prefix.pch @@ -1,4 +1,12 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-umbrella.h b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-umbrella.h new file mode 100644 index 0000000..c7dfda3 --- /dev/null +++ b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController-umbrella.h @@ -0,0 +1,20 @@ +#ifdef __OBJC__ +#import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif +#endif + +#import "MRGPagerController.h" +#import "MRGPagerStrip.h" +#import "MRGPagerTabStrip.h" +#import "MRGPagerTitleStrip.h" + +FOUNDATION_EXPORT double MRGPagerControllerVersionNumber; +FOUNDATION_EXPORT const unsigned char MRGPagerControllerVersionString[]; + diff --git a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.modulemap b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.modulemap new file mode 100644 index 0000000..bb73092 --- /dev/null +++ b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.modulemap @@ -0,0 +1,6 @@ +framework module MRGPagerController { + umbrella header "MRGPagerController-umbrella.h" + + export * + module * { export * } +} diff --git a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.xcconfig b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.xcconfig index 36be725..d0088f6 100644 --- a/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.xcconfig +++ b/Example/Pods/Target Support Files/MRGPagerController/MRGPagerController.xcconfig @@ -1,4 +1,9 @@ +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MRGPagerController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MRGPagerController" +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Info.plist b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Info.plist new file mode 100644 index 0000000..2243fe6 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.markdown index b2f1222..68dbca2 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.markdown @@ -3,7 +3,7 @@ This application makes use of the following third party libraries: ## MRGPagerController -Copyright (c) 2014-2017, Mirego +Copyright (c) 2014-2018, Mirego All rights reserved. Redistribution and use in source and binary forms, with or without @@ -30,4 +30,4 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.plist index 5182893..b22c068 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-acknowledgements.plist @@ -14,7 +14,7 @@ FooterText - Copyright (c) 2014-2017, Mirego + Copyright (c) 2014-2018, Mirego All rights reserved. Redistribution and use in source and binary forms, with or without @@ -41,6 +41,8 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License + BSD 3-Clause Title MRGPagerController Type @@ -48,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE. FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh index 6f76344..1ec5dc7 100755 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-frameworks.sh @@ -6,6 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -16,16 +24,16 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,24 +62,65 @@ install_framework() fi } +# Copies and strips a vendored dSYM +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + for arch in $binary_archs; do + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -80,5 +129,16 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } + +if [[ "$CONFIGURATION" == "Debug" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/MRGPagerController/MRGPagerController.framework" +fi +if [[ "$CONFIGURATION" == "Release" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/MRGPagerController/MRGPagerController.framework" +fi +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh index 16774fb..a7df440 100755 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-resources.sh @@ -1,65 +1,91 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() -realpath() { - DIRECTORY="$(cd "${1%/*}" && pwd)" - FILENAME="${1##*/}" - echo "$DIRECTORY/$FILENAME" -} +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" || true + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,28 +94,13 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do - if [[ $line != "`realpath $PODS_ROOT`*" ]]; then + if [[ $line != "${PODS_ROOT}*" ]]; then XCASSET_FILES+=("$line") fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-umbrella.h b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-umbrella.h new file mode 100644 index 0000000..151c5e9 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example-umbrella.h @@ -0,0 +1,16 @@ +#ifdef __OBJC__ +#import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif +#endif + + +FOUNDATION_EXPORT double Pods_MRGPagerController_ExampleVersionNumber; +FOUNDATION_EXPORT const unsigned char Pods_MRGPagerController_ExampleVersionString[]; + diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig index b0cbb79..576284a 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.debug.xcconfig @@ -1,5 +1,9 @@ +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_LDFLAGS = $(inherited) -ObjC -l"MRGPagerController" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController/MRGPagerController.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "MRGPagerController" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.modulemap b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.modulemap new file mode 100644 index 0000000..265af0c --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.modulemap @@ -0,0 +1,6 @@ +framework module Pods_MRGPagerController_Example { + umbrella header "Pods-MRGPagerController_Example-umbrella.h" + + export * + module * { export * } +} diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig index b0cbb79..576284a 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Example/Pods-MRGPagerController_Example.release.xcconfig @@ -1,5 +1,9 @@ +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_LDFLAGS = $(inherited) -ObjC -l"MRGPagerController" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController/MRGPagerController.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "MRGPagerController" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Info.plist b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Info.plist new file mode 100644 index 0000000..2243fe6 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.markdown index b2f1222..102af75 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.markdown @@ -1,33 +1,3 @@ # Acknowledgements This application makes use of the following third party libraries: - -## MRGPagerController - -Copyright (c) 2014-2017, Mirego -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -- Neither the name of the Mirego nor the names of its contributors may - be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.plist index 5182893..7acbad1 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-acknowledgements.plist @@ -14,41 +14,7 @@ FooterText - Copyright (c) 2014-2017, Mirego -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -- Neither the name of the Mirego nor the names of its contributors may - be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - Title - MRGPagerController - Type - PSGroupSpecifier - - - FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh index 6f76344..881cbae 100755 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-frameworks.sh @@ -6,6 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -16,16 +24,16 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,24 +62,65 @@ install_framework() fi } +# Copies and strips a vendored dSYM +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + for arch in $binary_archs; do + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -80,5 +129,9 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh index 16774fb..a7df440 100755 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-resources.sh @@ -1,65 +1,91 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() -realpath() { - DIRECTORY="$(cd "${1%/*}" && pwd)" - FILENAME="${1##*/}" - echo "$DIRECTORY/$FILENAME" -} +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" || true + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,28 +94,13 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do - if [[ $line != "`realpath $PODS_ROOT`*" ]]; then + if [[ $line != "${PODS_ROOT}*" ]]; then XCASSET_FILES+=("$line") fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-umbrella.h b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-umbrella.h new file mode 100644 index 0000000..e3c02d8 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests-umbrella.h @@ -0,0 +1,16 @@ +#ifdef __OBJC__ +#import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif +#endif + + +FOUNDATION_EXPORT double Pods_MRGPagerController_TestsVersionNumber; +FOUNDATION_EXPORT const unsigned char Pods_MRGPagerController_TestsVersionString[]; + diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig index b0cbb79..afd10b7 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.debug.xcconfig @@ -1,5 +1,8 @@ +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_LDFLAGS = $(inherited) -ObjC -l"MRGPagerController" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController/MRGPagerController.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.modulemap b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.modulemap new file mode 100644 index 0000000..734c6e9 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.modulemap @@ -0,0 +1,6 @@ +framework module Pods_MRGPagerController_Tests { + umbrella header "Pods-MRGPagerController_Tests-umbrella.h" + + export * + module * { export * } +} diff --git a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig index b0cbb79..afd10b7 100644 --- a/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MRGPagerController_Tests/Pods-MRGPagerController_Tests.release.xcconfig @@ -1,5 +1,8 @@ +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/MRGPagerController" -OTHER_LDFLAGS = $(inherited) -ObjC -l"MRGPagerController" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MRGPagerController/MRGPagerController.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index 1979810..0977910 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/LICENSE b/LICENSE index 552b7a4..8598440 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014-2017, Mirego +Copyright (c) 2014-2018, Mirego All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/MRGPagerController.podspec b/MRGPagerController.podspec index 3d9af02..fd43a44 100644 --- a/MRGPagerController.podspec +++ b/MRGPagerController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'MRGPagerController' - s.version = '1.0.14' + s.version = '1.1' s.summary = 'An highly customizable pager controller.' s.homepage = 'https://github.com/Mirego/MRGPagerController' s.license = 'BSD 3-Clause' @@ -11,6 +11,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.source_files = 'Pod/Classes' - s.ios.deployment_target = '7.0' - s.tvos.deployment_target = '9.0' + s.ios.deployment_target = '8.0' end diff --git a/Pod/Classes/MRGPagerController.h b/Pod/Classes/MRGPagerController.h index 9e6a5b8..cfc7f66 100644 --- a/Pod/Classes/MRGPagerController.h +++ b/Pod/Classes/MRGPagerController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -31,24 +31,29 @@ @protocol MRGPagerControllerDelegate; +NS_ASSUME_NONNULL_BEGIN + @interface MRGPagerController : UIViewController -@property (nonatomic, weak) id delegate; -@property (nonatomic, readonly) UIView *pagerStrip; -@property (nonatomic, copy) NSArray *viewControllers; -@property (nonatomic, weak) UIViewController *currentViewController; +@property (nonatomic, weak, nullable) id delegate; +@property (nonatomic, readonly, nullable) UIView *pagerStrip; +@property (nonatomic, copy, nullable) NSArray *viewControllers; +@property (nonatomic, weak, nullable) UIViewController *currentViewController; @property (nonatomic) UIEdgeInsets padding; - (instancetype)init; +- (instancetype)initWithPagerStripClass:(nullable Class)pagerStripClass; -- (instancetype)initWithPagerStripClass:(Class)pagerStripClass; - -- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated; +- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated; - (void)setCurrentViewController:(UIViewController *)currentViewController animated:(BOOL)animated; @end @protocol MRGPagerControllerDelegate + - (void)pagerController:(MRGPagerController *)pagerController didEndScrollingOnViewController:(UIViewController *)viewController; + @end + +NS_ASSUME_NONNULL_END diff --git a/Pod/Classes/MRGPagerController.m b/Pod/Classes/MRGPagerController.m index d95535a..25b6ec8 100644 --- a/Pod/Classes/MRGPagerController.m +++ b/Pod/Classes/MRGPagerController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -29,13 +29,14 @@ #import "MRGPagerController.h" @interface MRGPagerController () -@property (nonatomic) Class pagerStripClass; + +@property (nonatomic, nullable) Class pagerStripClass; @property (nonatomic) UIView *pagerStrip; @property (nonatomic) UIScrollView *pagerScrollView; @property (nonatomic) BOOL isLayouting; @property (nonatomic) BOOL callDidEndScrollingOnNextViewDidLayoutSubviews; @property (nonatomic) CGSize lastSize; -@property (nonatomic, weak) UIViewController *lastViewControllerEndedScrollingOn; +@property (nonatomic, weak, nullable) UIViewController *lastViewControllerEndedScrollingOn; @end @implementation MRGPagerController @@ -79,10 +80,8 @@ - (void)viewDidLoad { self.pagerScrollView = [[UIScrollView alloc] init]; self.pagerScrollView.delegate = self; -#if !TARGET_OS_TV self.pagerScrollView.scrollsToTop = NO; self.pagerScrollView.pagingEnabled = YES; -#endif self.pagerScrollView.showsHorizontalScrollIndicator = NO; self.pagerScrollView.showsVerticalScrollIndicator = NO; [self.view addSubview:self.pagerScrollView]; @@ -150,6 +149,9 @@ - (void)layoutPager { self.pagerScrollView.contentSize = CGSizeMake(frame.origin.x, CGRectGetHeight(self.pagerScrollView.bounds)); } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-implementations" + - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration]; @@ -180,6 +182,8 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInte }]; } +#pragma GCC diagnostic pop + #ifdef __IPHONE_8_0 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { @@ -207,12 +211,12 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id *)oldViewControllers newViewControllers:(NSArray *)newViewControllers animated:(BOOL)animated { if ([self isViewLoaded] == NO) { return; } - NSMutableOrderedSet *removeViewControllers = [[NSMutableOrderedSet alloc] initWithArray:oldViewControllers]; + NSMutableOrderedSet *removeViewControllers = [[NSMutableOrderedSet alloc] initWithArray:oldViewControllers]; [removeViewControllers minusSet:[[NSSet alloc] initWithArray:newViewControllers]]; for (UIViewController *viewController in removeViewControllers) { [viewController willMoveToParentViewController:nil]; @@ -224,7 +228,7 @@ - (void)updateViewControllersWithOldViewControllers:(NSArray *)oldViewController [viewController removeFromParentViewController]; } - NSMutableOrderedSet *addViewControllers = [[NSMutableOrderedSet alloc] initWithArray:newViewControllers]; + NSMutableOrderedSet *addViewControllers = [[NSMutableOrderedSet alloc] initWithArray:newViewControllers]; [addViewControllers minusSet:[[NSSet alloc] initWithArray:oldViewControllers]]; for (UIViewController *viewController in addViewControllers) { [self addChildViewController:viewController]; @@ -319,11 +323,11 @@ - (void)didEndScrolling { #pragma mark - get/set -- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated { +- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated { if (_viewControllers != viewControllers) { - NSArray *oldViewControllers = self.viewControllers; + NSArray *oldViewControllers = self.viewControllers; _viewControllers = [viewControllers copy]; - + [self.pagerStrip setPageTitles:[self getPageTitles] animated:animated]; [self updateViewControllersWithOldViewControllers:oldViewControllers newViewControllers:self.viewControllers animated:animated]; @@ -335,7 +339,7 @@ - (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated { } } -- (void)setViewControllers:(NSArray *)viewControllers { +- (void)setViewControllers:(NSArray *)viewControllers { [self setViewControllers:viewControllers animated:NO]; } @@ -365,8 +369,8 @@ - (void)setPadding:(UIEdgeInsets)padding { } } -- (NSArray *)getPageTitles { - NSMutableArray *titles = [NSMutableArray arrayWithCapacity:self.viewControllers.count]; +- (NSArray *)getPageTitles { + NSMutableArray *titles = [NSMutableArray arrayWithCapacity:self.viewControllers.count]; for (UIViewController *viewController in self.viewControllers) { [titles addObject:viewController.title]; } diff --git a/Pod/Classes/MRGPagerStrip.h b/Pod/Classes/MRGPagerStrip.h index f6c591d..e8b871a 100644 --- a/Pod/Classes/MRGPagerStrip.h +++ b/Pod/Classes/MRGPagerStrip.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,12 +30,14 @@ @protocol MRGPagerStripDelegate; +NS_ASSUME_NONNULL_BEGIN + @protocol MRGPagerStrip -@property (nonatomic, weak) id delegate; +@property (nonatomic, weak, nullable) id delegate; -@property (nonatomic, copy) NSArray *pageTitles; -- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated; +@property (nonatomic, copy, nullable) NSArray *pageTitles; +- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated; @property (nonatomic) CGFloat currentIndex; - (void)setCurrentIndex:(CGFloat)currentIndex animated:(BOOL)animated; @@ -48,3 +50,5 @@ - (void)pagerStrip:(id )pagerStrip didSelectPageAtIndex:(NSUInteger)pageIndex; @end + +NS_ASSUME_NONNULL_END diff --git a/Pod/Classes/MRGPagerTabStrip.h b/Pod/Classes/MRGPagerTabStrip.h index a908f82..198e41d 100644 --- a/Pod/Classes/MRGPagerTabStrip.h +++ b/Pod/Classes/MRGPagerTabStrip.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -28,12 +28,16 @@ #import "MRGPagerTitleStrip.h" +NS_ASSUME_NONNULL_BEGIN + @interface MRGPagerTabStrip : MRGPagerTitleStrip @property (nonatomic) BOOL drawFullUnderline; @property (nonatomic) CGFloat tabIndicatorHeight; @property (nonatomic) UIColor *tabIndicatorColor; -@property (nonatomic) UIColor *tabHighlightedBackgroundColor; //Defaults to tabIndicatorColor if nil -@property (nonatomic) UIColor *tabSelectedBackgroundColor; +@property (nonatomic, nullable) UIColor *tabHighlightedBackgroundColor; //Defaults to tabIndicatorColor if nil +@property (nonatomic, nullable) UIColor *tabSelectedBackgroundColor; @end + +NS_ASSUME_NONNULL_END diff --git a/Pod/Classes/MRGPagerTabStrip.m b/Pod/Classes/MRGPagerTabStrip.m index 6fb5c44..da6f483 100644 --- a/Pod/Classes/MRGPagerTabStrip.m +++ b/Pod/Classes/MRGPagerTabStrip.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ #import "MRGPagerTabStrip.h" @interface MRGPagerTabStrip () + @property (nonatomic) UIView *tabIndicatorView; @end @@ -44,6 +45,7 @@ - (instancetype)initWithFrame:(CGRect)frame { _tabIndicatorHeight = 2; _tabIndicatorColor = [UIColor whiteColor]; } + return self; } @@ -89,7 +91,7 @@ - (void)updateTabIndicatorAnimated:(BOOL)animated { width -= separatorWidth; nextWidth = CGRectGetWidth([[self.buttons objectAtIndex:(currentIndex+1)] bounds]); } - + CGFloat progress = ((self.currentIndex > 0) ? ((self.currentIndex < (self.buttons.count-1)) ? (self.currentIndex - floorf(self.currentIndex)) : 0.0f) : 0.0f); left += (width * progress); @@ -110,7 +112,7 @@ - (void)layoutSubviews { #pragma mark - get/set -- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated { +- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated { [super setPageTitles:pageTitles animated:animated]; UIColor *highlightedColor = self.tabHighlightedBackgroundColor ? self.tabHighlightedBackgroundColor : self.tabIndicatorColor; diff --git a/Pod/Classes/MRGPagerTitleStrip.h b/Pod/Classes/MRGPagerTitleStrip.h index ff47059..1cad705 100644 --- a/Pod/Classes/MRGPagerTitleStrip.h +++ b/Pod/Classes/MRGPagerTitleStrip.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -29,6 +29,8 @@ #import #import "MRGPagerStrip.h" +NS_ASSUME_NONNULL_BEGIN + @interface MRGPagerTitleStrip : UIView @property (nonatomic, readonly) UIScrollView *scrollView; @@ -53,3 +55,5 @@ - (void)updateView; @end + +NS_ASSUME_NONNULL_END diff --git a/Pod/Classes/MRGPagerTitleStrip.m b/Pod/Classes/MRGPagerTitleStrip.m index 22469cb..978ee5f 100644 --- a/Pod/Classes/MRGPagerTitleStrip.m +++ b/Pod/Classes/MRGPagerTitleStrip.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2014-2017, Mirego +// Copyright (c) 2014-2018, Mirego // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -32,8 +32,8 @@ @interface MRGPagerTitleStrip () @property (nonatomic, readonly) BOOL needsUpdateView; @property (nonatomic, readonly) BOOL needsUpdateSeparators; @property (nonatomic) UIScrollView *scrollView; -@property (nonatomic) NSMutableArray *buttons; -@property (nonatomic) NSMutableArray *separators; +@property (nonatomic) NSMutableArray *buttons; +@property (nonatomic) NSMutableArray *separators; @end @implementation MRGPagerTitleStrip @@ -60,9 +60,7 @@ - (instancetype)initWithFrame:(CGRect)frame { _separatorColor = [UIColor colorWithWhite:1 alpha:0.2f]; _scrollView = [[UIScrollView alloc] init]; -#if !TARGET_OS_TV _scrollView.scrollsToTop = NO; -#endif _scrollView.showsHorizontalScrollIndicator = NO; _scrollView.showsVerticalScrollIndicator = NO; [self addSubview:_scrollView]; @@ -132,8 +130,8 @@ - (void)layoutSubviews { CGSize size = self.bounds.size; CGSize separatorSize = (self.drawSeparator ? CGSizeMake(self.separatorSize.width, self.separatorSize.height * size.height) : CGSizeZero); - - NSMutableArray *buttonsWidths = [[NSMutableArray alloc] initWithCapacity:self.buttons.count]; + + NSMutableArray *buttonsWidths = [[NSMutableArray alloc] initWithCapacity:self.buttons.count]; __block CGFloat buttonsWidth = 0; [self.buttons enumerateObjectsUsingBlock:^(UIButton *button, NSUInteger idx, BOOL *stop) { CGFloat width = ((self.titleForcedWidth > 0) ? self.titleForcedWidth : [button sizeThatFits:CGSizeZero].width) + self.titleTextSpacing * 2; @@ -237,7 +235,7 @@ - (void)updateButtonIndex:(CGFloat)index { #pragma mark - get/set -- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated { +- (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated { if (_pageTitles != pageTitles) { _pageTitles = [pageTitles copy]; @@ -246,7 +244,7 @@ - (void)setPageTitles:(NSArray *)pageTitles animated:(BOOL)animated { } } -- (void)setPageTitles:(NSArray *)pageTitles { +- (void)setPageTitles:(NSArray *)pageTitles { [self setPageTitles:pageTitles animated:NO]; } diff --git a/README.md b/README.md index c698b45..f120a94 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ pod 'MRGPagerController', :git => 'https://github.com/mirego/MRGPagerController. ## License -MRGPagerController is © 2014-2017 [Mirego](http://www.mirego.com) and may be freely +MRGPagerController is © 2014-2018 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause). See the [`LICENSE.md`](https://github.com/mirego/MRGPagerController.iOS/blob/master/LICENSE.md) file.