Skip to content

Commit bb95be3

Browse files
changsanjiangchangsanjiang
committed
Release 0.0.8
1 parent 8f25032 commit bb95be3

18 files changed

Lines changed: 364 additions & 222 deletions

File tree

‎DemoObjC/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DemoObjC/SJPageViewController.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
isa = PBXProject;
314314
attributes = {
315315
CLASSPREFIX = SJ;
316-
LastUpgradeCheck = 0720;
316+
LastUpgradeCheck = 1140;
317317
ORGANIZATIONNAME = "changsanjiang@gmail.com";
318318
TargetAttributes = {
319319
6003F589195388D20070C39A = {
@@ -326,10 +326,9 @@
326326
};
327327
buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "SJPageViewController" */;
328328
compatibilityVersion = "Xcode 3.2";
329-
developmentRegion = English;
329+
developmentRegion = en;
330330
hasScannedForEncodings = 0;
331331
knownRegions = (
332-
English,
333332
en,
334333
Base,
335334
);
@@ -488,23 +487,37 @@
488487
isa = XCBuildConfiguration;
489488
buildSettings = {
490489
ALWAYS_SEARCH_USER_PATHS = NO;
490+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
491491
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
492492
CLANG_CXX_LIBRARY = "libc++";
493493
CLANG_ENABLE_MODULES = YES;
494494
CLANG_ENABLE_OBJC_ARC = YES;
495+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
495496
CLANG_WARN_BOOL_CONVERSION = YES;
497+
CLANG_WARN_COMMA = YES;
496498
CLANG_WARN_CONSTANT_CONVERSION = YES;
499+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
497500
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
498501
CLANG_WARN_EMPTY_BODY = YES;
499502
CLANG_WARN_ENUM_CONVERSION = YES;
503+
CLANG_WARN_INFINITE_RECURSION = YES;
500504
CLANG_WARN_INT_CONVERSION = YES;
505+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
506+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
507+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
501508
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
509+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
510+
CLANG_WARN_STRICT_PROTOTYPES = YES;
511+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
512+
CLANG_WARN_UNREACHABLE_CODE = YES;
502513
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
503514
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
504515
COPY_PHASE_STRIP = NO;
516+
ENABLE_STRICT_OBJC_MSGSEND = YES;
505517
ENABLE_TESTABILITY = YES;
506518
GCC_C_LANGUAGE_STANDARD = gnu99;
507519
GCC_DYNAMIC_NO_PIC = NO;
520+
GCC_NO_COMMON_BLOCKS = YES;
508521
GCC_OPTIMIZATION_LEVEL = 0;
509522
GCC_PREPROCESSOR_DEFINITIONS = (
510523
"DEBUG=1",
@@ -528,22 +541,36 @@
528541
isa = XCBuildConfiguration;
529542
buildSettings = {
530543
ALWAYS_SEARCH_USER_PATHS = NO;
544+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
531545
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
532546
CLANG_CXX_LIBRARY = "libc++";
533547
CLANG_ENABLE_MODULES = YES;
534548
CLANG_ENABLE_OBJC_ARC = YES;
549+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
535550
CLANG_WARN_BOOL_CONVERSION = YES;
551+
CLANG_WARN_COMMA = YES;
536552
CLANG_WARN_CONSTANT_CONVERSION = YES;
553+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
537554
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
538555
CLANG_WARN_EMPTY_BODY = YES;
539556
CLANG_WARN_ENUM_CONVERSION = YES;
557+
CLANG_WARN_INFINITE_RECURSION = YES;
540558
CLANG_WARN_INT_CONVERSION = YES;
559+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
560+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
561+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
541562
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
563+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
564+
CLANG_WARN_STRICT_PROTOTYPES = YES;
565+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
566+
CLANG_WARN_UNREACHABLE_CODE = YES;
542567
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
543568
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
544569
COPY_PHASE_STRIP = YES;
545570
ENABLE_NS_ASSERTIONS = NO;
571+
ENABLE_STRICT_OBJC_MSGSEND = YES;
546572
GCC_C_LANGUAGE_STANDARD = gnu99;
573+
GCC_NO_COMMON_BLOCKS = YES;
547574
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
548575
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
549576
GCC_WARN_UNDECLARED_SELECTOR = YES;

‎DemoObjC/SJPageViewController.xcodeproj/xcshareddata/xcschemes/SJPageViewController-Example.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "1140"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎DemoObjC/SJPageViewController/Demo/SJPageMenuBarDemoViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ - (void)pageViewController:(SJPageViewController *)pageViewController didScrollI
8282
}
8383
}
8484

85-
- (void)pageMenuBar:(SJPageMenuBar *)bar focusedIndexDidChange:(NSInteger)index {
85+
- (void)pageMenuBar:(SJPageMenuBar *)bar focusedIndexDidChange:(NSUInteger)index {
8686
if ( ![self.pageViewController isViewControllerVisibleAtIndex:index] ) {
8787
[self.pageViewController setViewControllerAtIndex:index];
8888
}

‎DemoObjC/SJPageViewController/Demo/SJViewController5.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ - (void)pageViewController:(SJPageViewController *)pageViewController didScrollI
155155

156156
#pragma mark - Page Menu Bar
157157

158-
- (void)pageMenuBar:(SJPageMenuBar *)bar focusedIndexDidChange:(NSInteger)index {
158+
- (void)pageMenuBar:(SJPageMenuBar *)bar focusedIndexDidChange:(NSUInteger)index {
159159
if ( [_pageViewController isViewControllerVisibleAtIndex:index] ) return;
160160
[_pageViewController setViewControllerAtIndex:index];
161161
}

‎DemoSwift/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DemoSwift/SJPageViewControllerswift.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
isa = PBXProject;
227227
attributes = {
228228
LastSwiftUpdateCheck = 0830;
229-
LastUpgradeCheck = 0830;
229+
LastUpgradeCheck = 1140;
230230
ORGANIZATIONNAME = CocoaPods;
231231
TargetAttributes = {
232232
607FACCF1AFB9204008FA782 = {
@@ -236,17 +236,16 @@
236236
};
237237
607FACE41AFB9204008FA782 = {
238238
CreatedOnToolsVersion = 6.3.1;
239-
LastSwiftMigration = 0900;
239+
LastSwiftMigration = 1140;
240240
TestTargetID = 607FACCF1AFB9204008FA782;
241241
};
242242
};
243243
};
244244
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "SJPageViewControllerswift" */;
245245
compatibilityVersion = "Xcode 3.2";
246-
developmentRegion = English;
246+
developmentRegion = en;
247247
hasScannedForEncodings = 0;
248248
knownRegions = (
249-
English,
250249
en,
251250
Base,
252251
);
@@ -390,12 +389,14 @@
390389
CLANG_WARN_BOOL_CONVERSION = YES;
391390
CLANG_WARN_COMMA = YES;
392391
CLANG_WARN_CONSTANT_CONVERSION = YES;
392+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
393393
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
394394
CLANG_WARN_EMPTY_BODY = YES;
395395
CLANG_WARN_ENUM_CONVERSION = YES;
396396
CLANG_WARN_INFINITE_RECURSION = YES;
397397
CLANG_WARN_INT_CONVERSION = YES;
398398
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
399+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
399400
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
400401
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
401402
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -443,12 +444,14 @@
443444
CLANG_WARN_BOOL_CONVERSION = YES;
444445
CLANG_WARN_COMMA = YES;
445446
CLANG_WARN_CONSTANT_CONVERSION = YES;
447+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
446448
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
447449
CLANG_WARN_EMPTY_BODY = YES;
448450
CLANG_WARN_ENUM_CONVERSION = YES;
449451
CLANG_WARN_INFINITE_RECURSION = YES;
450452
CLANG_WARN_INT_CONVERSION = YES;
451453
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
454+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
452455
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
453456
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
454457
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -527,7 +530,7 @@
527530
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
528531
PRODUCT_NAME = "$(TARGET_NAME)";
529532
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
530-
SWIFT_VERSION = 4.0;
533+
SWIFT_VERSION = 5.0;
531534
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SJPageViewControllerswift_Example.app/SJPageViewControllerswift_Example";
532535
};
533536
name = Debug;
@@ -544,7 +547,7 @@
544547
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
545548
PRODUCT_NAME = "$(TARGET_NAME)";
546549
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
547-
SWIFT_VERSION = 4.0;
550+
SWIFT_VERSION = 5.0;
548551
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SJPageViewControllerswift_Example.app/SJPageViewControllerswift_Example";
549552
};
550553
name = Release;

‎DemoSwift/SJPageViewControllerswift.xcodeproj/xcshareddata/xcschemes/SJPageViewControllerswift-Example.xcscheme‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1140"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,8 +40,16 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
48+
BuildableName = "SJPageViewControllerswift_Example.app"
49+
BlueprintName = "SJPageViewControllerswift_Example"
50+
ReferencedContainer = "container:SJPageViewControllerswift.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4553
<Testables>
4654
<TestableReference
4755
skipped = "NO">
@@ -54,23 +62,11 @@
5462
</BuildableReference>
5563
</TestableReference>
5664
</Testables>
57-
<MacroExpansion>
58-
<BuildableReference
59-
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
61-
BuildableName = "SJPageViewControllerswift_Example.app"
62-
BlueprintName = "SJPageViewControllerswift_Example"
63-
ReferencedContainer = "container:SJPageViewControllerswift.xcodeproj">
64-
</BuildableReference>
65-
</MacroExpansion>
66-
<AdditionalOptions>
67-
</AdditionalOptions>
6865
</TestAction>
6966
<LaunchAction
7067
buildConfiguration = "Debug"
7168
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7269
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7470
launchStyle = "0"
7571
useCustomWorkingDirectory = "NO"
7672
ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
8783
ReferencedContainer = "container:SJPageViewControllerswift.xcodeproj">
8884
</BuildableReference>
8985
</BuildableProductRunnable>
90-
<AdditionalOptions>
91-
</AdditionalOptions>
9286
</LaunchAction>
9387
<ProfileAction
9488
buildConfiguration = "Release"

‎DemoSwift/SJPageViewControllerswift/Demo/SJViewController1.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SJViewController1: UIViewController {
4545
views.append(itemView)
4646
}
4747

48-
self.pageMenuBar.itemViews = views
48+
self.pageMenuBar.setItemViews(views)
4949
self.pageViewController.reload()
5050
self.pageMenuBar.scrollToItem(at: 4, animated: false)
5151
}

‎DemoSwift/SJPageViewControllerswift/Demo/SJViewController2.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class SJViewController2: UIViewController {
4141
views.append(itemView)
4242
}
4343

44-
self.pageMenuBar.itemViews = views
44+
self.pageMenuBar.setItemViews(views)
4545
self.pageViewController.reload()
4646
self.pageMenuBar.scrollToItem(at: 4, animated: false)
4747
}

0 commit comments

Comments
 (0)