Skip to content

Commit bc2f7c0

Browse files
victorkachalovThaliavictorkachalovThalia
committed
bloc
1 parent d2fd04a commit bc2f7c0

18 files changed

+414
-164
lines changed

‎.swiftlint.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
disabled_rules: # rule identifiers to exclude from running
2+
- colon
3+
- comma
4+
- control_statement
5+
opt_in_rules: # some rules are only opt-in
6+
- empty_count
7+
# Find all the available rules by running:
8+
# swiftlint rules
9+
included: # paths to include during linting. `--path` is ignored if present.
10+
- SwiftBloc
11+
excluded: # paths to ignore during linting. Takes precedence over `included`.
12+
- Carthage
13+
analyzer_rules: # Rules run by `swiftlint analyze` (experimental)
14+
- explicit_self
15+
16+
# configurable rules can be customized from this configuration file
17+
# binary rules can set their severity level
18+
force_cast: warning # implicitly
19+
force_try:
20+
severity: warning # explicitly
21+
# rules that have both warning and error levels, can set just the warning level
22+
# implicitly
23+
line_length: 110
24+
# they can set both implicitly with an array
25+
type_body_length:
26+
- 300 # warning
27+
- 400 # error
28+
# or they can set both explicitly
29+
file_length:
30+
warning: 500
31+
error: 1200
32+
# naming rules can set warnings/errors for min_length and max_length
33+
# additionally they can set excluded names
34+
type_name:
35+
min_length: 2 # only warning
36+
max_length: # warning and error
37+
warning: 40
38+
error: 50
39+
excluded: iPhone # excluded via string
40+
allowed_symbols: ["_"] # these are allowed in type names
41+
identifier_name:
42+
min_length: 2 # only min_length
43+
max_length: # warning and error
44+
warning: 40
45+
error: 50 # only error
46+
excluded: # excluded via string array
47+
- id
48+
- URL
49+
- GlobalAPIKey
50+
reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit, html, emoji, sonarqube, markdown)

‎Bloc.swift

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎BlocObserver.swift

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Example/Pods/Pods.xcodeproj/project.pbxproj

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

‎Example/SwiftBloc.xcodeproj/project.pbxproj

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
043EE4E125EC1C9500FAE1E8 /* CounterBloc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043EE4E025EC1C9500FAE1E8 /* CounterBloc.swift */; };
1011
047EC4D025EAEE860004C90C /* CounterCubit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047EC4CF25EAEE860004C90C /* CounterCubit.swift */; };
1112
04EB15FB25EAC7E8008E0030 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EB15FA25EAC7E8008E0030 /* SceneDelegate.swift */; };
1213
08611E94466D97B3F329DCE3 /* Pods_SwiftBloc_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82EC3EC02FB63CEFC4EA0403 /* Pods_SwiftBloc_Tests.framework */; };
@@ -30,6 +31,8 @@
3031

3132
/* Begin PBXFileReference section */
3233
03ED00AF75438BCB8C629F90 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
34+
043EE4DE25EC197400FAE1E8 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; name = .swiftlint.yml; path = ../.swiftlint.yml; sourceTree = "<group>"; };
35+
043EE4E025EC1C9500FAE1E8 /* CounterBloc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CounterBloc.swift; sourceTree = "<group>"; };
3336
047EC4CF25EAEE860004C90C /* CounterCubit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CounterCubit.swift; sourceTree = "<group>"; };
3437
04EB15FA25EAC7E8008E0030 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
3538
0D9208F1CC2C0172BFA8D1E4 /* Pods_SwiftBloc_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftBloc_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -74,6 +77,7 @@
7477
607FACC71AFB9204008FA782 = {
7578
isa = PBXGroup;
7679
children = (
80+
043EE4DE25EC197400FAE1E8 /* .swiftlint.yml */,
7781
607FACF51AFB993E008FA782 /* Podspec Metadata */,
7882
607FACD21AFB9204008FA782 /* Example for SwiftBloc */,
7983
607FACE81AFB9204008FA782 /* Tests */,
@@ -95,6 +99,7 @@
9599
607FACD21AFB9204008FA782 /* Example for SwiftBloc */ = {
96100
isa = PBXGroup;
97101
children = (
102+
043EE4E025EC1C9500FAE1E8 /* CounterBloc.swift */,
98103
047EC4CF25EAEE860004C90C /* CounterCubit.swift */,
99104
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
100105
04EB15FA25EAC7E8008E0030 /* SceneDelegate.swift */,
@@ -174,6 +179,7 @@
174179
607FACCD1AFB9204008FA782 /* Frameworks */,
175180
607FACCE1AFB9204008FA782 /* Resources */,
176181
D985EF46B9ABAFD856DF447C /* [CP] Embed Pods Frameworks */,
182+
043EE4DF25EC197D00FAE1E8 /* ShellScript */,
177183
);
178184
buildRules = (
179185
);
@@ -210,26 +216,25 @@
210216
isa = PBXProject;
211217
attributes = {
212218
LastSwiftUpdateCheck = 0830;
213-
LastUpgradeCheck = 0830;
219+
LastUpgradeCheck = 1170;
214220
ORGANIZATIONNAME = CocoaPods;
215221
TargetAttributes = {
216222
607FACCF1AFB9204008FA782 = {
217223
CreatedOnToolsVersion = 6.3.1;
218-
LastSwiftMigration = 0900;
224+
LastSwiftMigration = 1170;
219225
};
220226
607FACE41AFB9204008FA782 = {
221227
CreatedOnToolsVersion = 6.3.1;
222-
LastSwiftMigration = 0900;
228+
LastSwiftMigration = 1170;
223229
TestTargetID = 607FACCF1AFB9204008FA782;
224230
};
225231
};
226232
};
227233
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "SwiftBloc" */;
228234
compatibilityVersion = "Xcode 3.2";
229-
developmentRegion = English;
235+
developmentRegion = en;
230236
hasScannedForEncodings = 0;
231237
knownRegions = (
232-
English,
233238
en,
234239
Base,
235240
);
@@ -264,6 +269,23 @@
264269
/* End PBXResourcesBuildPhase section */
265270

266271
/* Begin PBXShellScriptBuildPhase section */
272+
043EE4DF25EC197D00FAE1E8 /* ShellScript */ = {
273+
isa = PBXShellScriptBuildPhase;
274+
buildActionMask = 2147483647;
275+
files = (
276+
);
277+
inputFileListPaths = (
278+
);
279+
inputPaths = (
280+
);
281+
outputFileListPaths = (
282+
);
283+
outputPaths = (
284+
);
285+
runOnlyForDeploymentPostprocessing = 0;
286+
shellPath = /bin/sh;
287+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
288+
};
267289
0DA03A21836D47B66ED6AC31 /* [CP] Check Pods Manifest.lock */ = {
268290
isa = PBXShellScriptBuildPhase;
269291
buildActionMask = 2147483647;
@@ -333,6 +355,7 @@
333355
isa = PBXSourcesBuildPhase;
334356
buildActionMask = 2147483647;
335357
files = (
358+
043EE4E125EC1C9500FAE1E8 /* CounterBloc.swift in Sources */,
336359
047EC4D025EAEE860004C90C /* CounterCubit.swift in Sources */,
337360
607FACD81AFB9204008FA782 /* ContentView.swift in Sources */,
338361
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
@@ -382,12 +405,14 @@
382405
CLANG_WARN_BOOL_CONVERSION = YES;
383406
CLANG_WARN_COMMA = YES;
384407
CLANG_WARN_CONSTANT_CONVERSION = YES;
408+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
385409
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
386410
CLANG_WARN_EMPTY_BODY = YES;
387411
CLANG_WARN_ENUM_CONVERSION = YES;
388412
CLANG_WARN_INFINITE_RECURSION = YES;
389413
CLANG_WARN_INT_CONVERSION = YES;
390414
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
415+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
391416
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
392417
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
393418
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -435,12 +460,14 @@
435460
CLANG_WARN_BOOL_CONVERSION = YES;
436461
CLANG_WARN_COMMA = YES;
437462
CLANG_WARN_CONSTANT_CONVERSION = YES;
463+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
438464
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
439465
CLANG_WARN_EMPTY_BODY = YES;
440466
CLANG_WARN_ENUM_CONVERSION = YES;
441467
CLANG_WARN_INFINITE_RECURSION = YES;
442468
CLANG_WARN_INT_CONVERSION = YES;
443469
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
470+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
444471
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
445472
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
446473
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -480,7 +507,7 @@
480507
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
481508
PRODUCT_NAME = "$(TARGET_NAME)";
482509
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
483-
SWIFT_VERSION = 4.0;
510+
SWIFT_VERSION = 5.0;
484511
};
485512
name = Debug;
486513
};
@@ -495,7 +522,7 @@
495522
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
496523
PRODUCT_NAME = "$(TARGET_NAME)";
497524
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
498-
SWIFT_VERSION = 4.0;
525+
SWIFT_VERSION = 5.0;
499526
};
500527
name = Release;
501528
};
@@ -516,7 +543,7 @@
516543
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
517544
PRODUCT_NAME = "$(TARGET_NAME)";
518545
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
519-
SWIFT_VERSION = 4.0;
546+
SWIFT_VERSION = 5.0;
520547
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftBloc_Example.app/SwiftBloc_Example";
521548
};
522549
name = Debug;
@@ -534,7 +561,7 @@
534561
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
535562
PRODUCT_NAME = "$(TARGET_NAME)";
536563
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
537-
SWIFT_VERSION = 4.0;
564+
SWIFT_VERSION = 5.0;
538565
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftBloc_Example.app/SwiftBloc_Example";
539566
};
540567
name = Release;

0 commit comments

Comments
 (0)