diff --git a/.travis.yml b/.travis.yml index dafca9b..2d0ad1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode6.4 +osx_image: xcode7 before_install: - if test -z $(brew list | grep -i xcproj); then brew install xcproj; fi - export LANG=en_US.UTF-8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e677e1..ba56d1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -## Version 0.2.0 +## v0.2.1 + +#### Breaking + +* Header files other than `NEUPagingSegmentedControl` are now private + +## v0.2.0 #### Added @@ -12,6 +18,6 @@ * Fix the area used in `- drawRect:` * Fix the key-value observer compliance -## Version 0.1.0 +## v0.1.0 * Initial release diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index d46e859..b313fc9 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -115,6 +115,7 @@ B59564CC1B89FDA700B82C60 /* Frameworks */, B59564CD1B89FDA700B82C60 /* Resources */, 9E6967B4E9C169DA1D9FC55A /* Copy Pods Resources */, + 3FD8565B217D38E31B9A27A8 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -131,7 +132,7 @@ B59564C71B89FDA700B82C60 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 0710; ORGANIZATIONNAME = bcylin; TargetAttributes = { B59564CE1B89FDA700B82C60 = { @@ -186,6 +187,21 @@ 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"; showEnvVarsInLog = 0; }; + 3FD8565B217D38E31B9A27A8 /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 9E6967B4E9C169DA1D9FC55A /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -257,6 +273,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -272,7 +289,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -309,7 +326,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -323,6 +340,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -334,6 +352,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index f261a54..660aba3 100644 --- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:Example.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist index dc8b672..e09fbe6 100644 --- a/Example/Example/Info.plist +++ b/Example/Example/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - me.neuvie.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.0 + 0.2.1 CFBundleSignature ???? CFBundleVersion - 1 + 101 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Example/Example/ViewController.m b/Example/Example/ViewController.m index a7897e1..67e851a 100644 --- a/Example/Example/ViewController.m +++ b/Example/Example/ViewController.m @@ -8,7 +8,6 @@ #import "ViewController.h" #import "NEUPagingSegmentedControl.h" -#import "NEUBorderedView.h" @interface ViewController () @property (nonatomic, strong) NEUPagingSegmentedControl *segmentedControl; @@ -81,12 +80,14 @@ - (void)createScrollViewPagesWithSegments:(NSArray *)segments UIFontDescriptor *fontDescriptor = [UIFontDescriptor preferredFontDescriptorWithTextStyle:UIFontTextStyleHeadline]; for (NSInteger i = 0, count = [segments count]; i < count; i++) { - NEUBorderedView *view = [[NEUBorderedView alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; + UIView *view = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; UILabel *label = [[UILabel alloc] initWithFrame:view.bounds]; - view.borderType = NEUBorderTypeAllBorders; view.backgroundColor = [UIColor whiteColor]; - view.borderColor = [UIColor grayColor]; + view.layer.borderWidth = 1 / [[UIScreen mainScreen] scale]; + view.layer.borderColor = [[UIColor grayColor] CGColor]; + view.layer.rasterizationScale = [[UIScreen mainScreen] scale]; + view.layer.shouldRasterize = YES; label.backgroundColor = [UIColor clearColor]; label.textColor = [UIColor grayColor]; diff --git a/Gemfile b/Gemfile index a5f391e..e60a68f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "http://rubygems.org" -gem "cocoapods", "~> 0.38.0" +gem "cocoapods", "~> 0.39.0" diff --git a/Gemfile.lock b/Gemfile.lock index e36444e..53238b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,53 +1,54 @@ GEM remote: http://rubygems.org/ specs: - activesupport (4.2.3) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) claide (0.9.1) - cocoapods (0.38.2) - activesupport (>= 3.2.15) + cocoapods (0.39.0) + activesupport (>= 4.0.2) claide (~> 0.9.1) - cocoapods-core (= 0.38.2) - cocoapods-downloader (~> 0.9.1) + cocoapods-core (= 0.39.0) + cocoapods-downloader (~> 0.9.3) cocoapods-plugins (~> 0.4.2) - cocoapods-stats (~> 0.5.3) - cocoapods-trunk (~> 0.6.1) - cocoapods-try (~> 0.4.5) + cocoapods-search (~> 0.1.0) + cocoapods-stats (~> 0.6.2) + cocoapods-trunk (~> 0.6.4) + cocoapods-try (~> 0.5.1) colored (~> 1.2) escape (~> 0.0.4) - molinillo (~> 0.3.1) - nap (~> 0.8) - xcodeproj (~> 0.26.3) - cocoapods-core (0.38.2) - activesupport (>= 3.2.15) + molinillo (~> 0.4.0) + nap (~> 1.0) + xcodeproj (~> 0.28.2) + cocoapods-core (0.39.0) + activesupport (>= 4.0.2) fuzzy_match (~> 2.0.4) - nap (~> 0.8.0) - cocoapods-downloader (0.9.1) + nap (~> 1.0) + cocoapods-downloader (0.9.3) cocoapods-plugins (0.4.2) nap - cocoapods-stats (0.5.3) - nap (~> 0.8) - cocoapods-trunk (0.6.1) - nap (>= 0.8) + cocoapods-search (0.1.0) + cocoapods-stats (0.6.2) + cocoapods-trunk (0.6.4) + nap (>= 0.8, < 2.0) netrc (= 0.7.8) - cocoapods-try (0.4.5) + cocoapods-try (0.5.1) colored (1.2) escape (0.0.4) fuzzy_match (2.0.4) i18n (0.7.0) json (1.8.3) - minitest (5.8.0) - molinillo (0.3.1) - nap (0.8.0) + minitest (5.8.1) + molinillo (0.4.0) + nap (1.0.0) netrc (0.7.8) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (0.26.3) + xcodeproj (0.28.2) activesupport (>= 3) claide (~> 0.9.1) colored (~> 1.2) @@ -56,4 +57,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 0.38.0) + cocoapods (~> 0.39.0) + +BUNDLED WITH + 1.10.6 diff --git a/NEUPagingSegmentedControl.podspec b/NEUPagingSegmentedControl.podspec index d84623f..3c58946 100644 --- a/NEUPagingSegmentedControl.podspec +++ b/NEUPagingSegmentedControl.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "NEUPagingSegmentedControl" - s.version = "0.2.0" + s.version = "0.2.1" s.summary = "A horizontal segmented control that works with UIScrollView paging." s.screenshots = "https://bcylin.github.io/NEUPagingSegmentedControl/img/screenshot.png" @@ -9,7 +9,8 @@ Pod::Spec.new do |s| s.author = "bcylin" s.platform = :ios, "7.0" + s.requires_arc = true s.source = { git: "https://github.com/bcylin/NEUPagingSegmentedControl.git", tag: "v#{s.version}" } s.source_files = "Source/*.{h,m}" - s.requires_arc = true + s.public_header_files = "Source/NEUPagingSegmentedControl.h" end diff --git a/NEUPagingSegmentedControl.xcodeproj/project.pbxproj b/NEUPagingSegmentedControl.xcodeproj/project.pbxproj index 3fbc0b8..6d22f7c 100644 --- a/NEUPagingSegmentedControl.xcodeproj/project.pbxproj +++ b/NEUPagingSegmentedControl.xcodeproj/project.pbxproj @@ -175,7 +175,7 @@ B59564231B89B34300B82C60 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = bcylin; TargetAttributes = { B595642B1B89B34300B82C60 = { @@ -273,6 +273,7 @@ CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -288,7 +289,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -329,7 +330,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.4; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,6 +350,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = NEUPagingSegmentedControl; SKIP_INSTALL = YES; }; @@ -364,6 +366,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = NEUPagingSegmentedControl; SKIP_INSTALL = YES; }; @@ -373,7 +376,7 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(inherited)", ); GCC_PREPROCESSOR_DEFINITIONS = ( @@ -382,6 +385,7 @@ ); INFOPLIST_FILE = NEUPagingSegmentedControlTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -390,11 +394,12 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(inherited)", ); INFOPLIST_FILE = NEUPagingSegmentedControlTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "me.neuvie.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/NEUPagingSegmentedControl.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/NEUPagingSegmentedControl.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..94b2795 --- /dev/null +++ b/NEUPagingSegmentedControl.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,4 @@ + + + diff --git a/NEUPagingSegmentedControl.xcodeproj/xcshareddata/xcschemes/NEUPagingSegmentedControl-iOS.xcscheme b/NEUPagingSegmentedControl.xcodeproj/xcshareddata/xcschemes/NEUPagingSegmentedControl-iOS.xcscheme index db9c066..6721c32 100644 --- a/NEUPagingSegmentedControl.xcodeproj/xcshareddata/xcschemes/NEUPagingSegmentedControl-iOS.xcscheme +++ b/NEUPagingSegmentedControl.xcodeproj/xcshareddata/xcschemes/NEUPagingSegmentedControl-iOS.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:NEUPagingSegmentedControl.xcodeproj"> + + CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - me.neuvie.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Podfile.lock b/Podfile.lock index 0c1ca0e..5dd84cc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - NEUPagingSegmentedControl (0.2.0) + - NEUPagingSegmentedControl (0.2.1) DEPENDENCIES: - NEUPagingSegmentedControl (from `./`) @@ -9,6 +9,6 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - NEUPagingSegmentedControl: 53d8d8c87685e48354260fd7fcc24dfbdf79f29c + NEUPagingSegmentedControl: aaab0d6c490275434dfb04ba0ffeef55c8603bd9 -COCOAPODS: 0.38.2 +COCOAPODS: 0.39.0 diff --git a/Source/Info.plist b/Source/Info.plist index d56961a..b952144 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - me.neuvie.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.2.0 + 0.2.1 CFBundleSignature ???? CFBundleVersion