Skip to content
This repository was archived by the owner on Dec 17, 2018. It is now read-only.

Commit 0320a95

Browse files
SorixSorix
authored
Update to Swift 4, always sync on startup (#6)
Now you need to use `CloudCore.fetchAndSave(container: persistentContainer, error: nil, completion: nil)` on application start-up to perform initial sync.
1 parent 3824e37 commit 0320a95

File tree

19 files changed

+105
-51
lines changed

19 files changed

+105
-51
lines changed

‎.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode8.3
1+
osx_image: xcode9
22
language: objective-c
33

44
branches:
@@ -14,7 +14,7 @@ env:
1414
- MACOS_FRAMEWORK_SCHEME="CloudCore-Mac"
1515
- EXAMPLE_SCHEME="CloudCoreExample"
1616
matrix:
17-
- DESTINATION="OS=10.3,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" BUILD_EXAMPLE="YES" POD_LINT="YES"
17+
- DESTINATION="OS=11.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" BUILD_EXAMPLE="YES" POD_LINT="YES"
1818
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" BUILD_EXAMPLE="NO" POD_LINT="NO"
1919

2020
before_install:
@@ -34,7 +34,12 @@ script:
3434
xcodebuild -project "$EXAMPLE_PROJECT" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -f `xcpretty-travis-formatter`;
3535
fi
3636

37-
# Run `pod lib lint` if specified
38-
- if [ $POD_LINT == "YES" ]; then
39-
pod lib lint;
37+
# Run on Pull Request
38+
- if [ $POD_LINT == "YES" && $TRAVIS_PULL_REQUEST != "false" ]; then
39+
pod lib lint --allow-warnings;
40+
fi
41+
42+
# Run release to master branch
43+
- if [ $POD_LINT == "YES" && $TRAVIS_BRANCH = "master" ]; then
44+
pod spec lint --allow-warnings;
4045
fi

‎CloudCore.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "CloudCore"
33
s.summary = "Framework that enables syncing between iCloud (CloudKit) and Core Data"
4-
s.version = "0.1.2"
4+
s.version = "1.0.0"
55
s.homepage = "https://github.com/sorix/CloudCore"
66
s.license = 'MIT'
77
s.author = { "Vasily Ulianov" => "[email protected]" }
@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
2020
s.ios.frameworks = 'Foundation', 'CloudKit', 'CoreData'
2121
s.osx.frameworks = 'Foundation', 'CloudKit', 'CoreData'
2222

23-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }
23+
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
2424
s.documentation_url = 'https://github.com/Sorix/CloudCore/wiki'
2525
end

‎CloudCore.xcodeproj/project.pbxproj

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,12 @@
556556
isa = PBXProject;
557557
attributes = {
558558
LastSwiftUpdateCheck = 0820;
559-
LastUpgradeCheck = 0820;
559+
LastUpgradeCheck = 0900;
560560
ORGANIZATIONNAME = "Vasily Ulianov";
561561
TargetAttributes = {
562562
D5B2E89E1C3A780C00C0327D = {
563563
CreatedOnToolsVersion = 7.2;
564-
LastSwiftMigration = 0800;
564+
LastSwiftMigration = 0900;
565565
ProvisioningStyle = Automatic;
566566
};
567567
D5C6293F1C3A7FAA007F7B7C = {
@@ -570,6 +570,7 @@
570570
};
571571
E29BB2271E436F310020F5B6 = {
572572
CreatedOnToolsVersion = 8.2.1;
573+
LastSwiftMigration = 0900;
573574
ProvisioningStyle = Automatic;
574575
};
575576
E29D11811E69B30C00E3DCBF = {
@@ -768,14 +769,20 @@
768769
CLANG_CXX_LIBRARY = "libc++";
769770
CLANG_ENABLE_MODULES = YES;
770771
CLANG_ENABLE_OBJC_ARC = YES;
772+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
771773
CLANG_WARN_BOOL_CONVERSION = YES;
774+
CLANG_WARN_COMMA = YES;
772775
CLANG_WARN_CONSTANT_CONVERSION = YES;
773776
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
774777
CLANG_WARN_EMPTY_BODY = YES;
775778
CLANG_WARN_ENUM_CONVERSION = YES;
776779
CLANG_WARN_INFINITE_RECURSION = YES;
777780
CLANG_WARN_INT_CONVERSION = YES;
781+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
782+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
778783
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
784+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
785+
CLANG_WARN_STRICT_PROTOTYPES = YES;
779786
CLANG_WARN_SUSPICIOUS_MOVE = YES;
780787
CLANG_WARN_UNREACHABLE_CODE = YES;
781788
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -820,14 +827,20 @@
820827
CLANG_CXX_LIBRARY = "libc++";
821828
CLANG_ENABLE_MODULES = YES;
822829
CLANG_ENABLE_OBJC_ARC = YES;
830+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
823831
CLANG_WARN_BOOL_CONVERSION = YES;
832+
CLANG_WARN_COMMA = YES;
824833
CLANG_WARN_CONSTANT_CONVERSION = YES;
825834
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
826835
CLANG_WARN_EMPTY_BODY = YES;
827836
CLANG_WARN_ENUM_CONVERSION = YES;
828837
CLANG_WARN_INFINITE_RECURSION = YES;
829838
CLANG_WARN_INT_CONVERSION = YES;
839+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
840+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
830841
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
842+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
843+
CLANG_WARN_STRICT_PROTOTYPES = YES;
831844
CLANG_WARN_SUSPICIOUS_MOVE = YES;
832845
CLANG_WARN_UNREACHABLE_CODE = YES;
833846
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -876,6 +889,8 @@
876889
PROVISIONING_PROFILE_SPECIFIER = "";
877890
SKIP_INSTALL = YES;
878891
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
892+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
893+
SWIFT_VERSION = 4.0;
879894
};
880895
name = Debug;
881896
};
@@ -896,6 +911,8 @@
896911
PRODUCT_NAME = CloudCore;
897912
PROVISIONING_PROFILE_SPECIFIER = "";
898913
SKIP_INSTALL = YES;
914+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
915+
SWIFT_VERSION = 4.0;
899916
};
900917
name = Release;
901918
};
@@ -920,6 +937,7 @@
920937
SDKROOT = macosx;
921938
SKIP_INSTALL = YES;
922939
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
940+
SWIFT_VERSION = 4.0;
923941
};
924942
name = Debug;
925943
};
@@ -943,6 +961,7 @@
943961
PROVISIONING_PROFILE_SPECIFIER = "";
944962
SDKROOT = macosx;
945963
SKIP_INSTALL = YES;
964+
SWIFT_VERSION = 4.0;
946965
};
947966
name = Release;
948967
};
@@ -961,7 +980,8 @@
961980
PRODUCT_NAME = "$(TARGET_NAME)";
962981
PROVISIONING_PROFILE_SPECIFIER = "";
963982
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
964-
SWIFT_VERSION = 3.0;
983+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
984+
SWIFT_VERSION = 4.0;
965985
};
966986
name = Debug;
967987
};
@@ -978,7 +998,8 @@
978998
PRODUCT_BUNDLE_IDENTIFIER = "uvasily.CloudCoreTests-iOS";
979999
PRODUCT_NAME = "$(TARGET_NAME)";
9801000
PROVISIONING_PROFILE_SPECIFIER = "";
981-
SWIFT_VERSION = 3.0;
1001+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1002+
SWIFT_VERSION = 4.0;
9821003
};
9831004
name = Release;
9841005
};
@@ -997,7 +1018,7 @@
9971018
PRODUCT_NAME = "$(TARGET_NAME)";
9981019
SDKROOT = macosx;
9991020
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1000-
SWIFT_VERSION = 3.0;
1021+
SWIFT_VERSION = 4.0;
10011022
};
10021023
name = Debug;
10031024
};
@@ -1014,7 +1035,7 @@
10141035
PRODUCT_BUNDLE_IDENTIFIER = "uvasily.CloudCoreTests-macOS";
10151036
PRODUCT_NAME = "$(TARGET_NAME)";
10161037
SDKROOT = macosx;
1017-
SWIFT_VERSION = 3.0;
1038+
SWIFT_VERSION = 4.0;
10181039
};
10191040
name = Release;
10201041
};

‎CloudCore.xcodeproj/xcshareddata/xcschemes/CloudCore-Mac.xcscheme

Lines changed: 3 additions & 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎CloudCore.xcodeproj/xcshareddata/xcschemes/CloudCore-iOS.xcscheme

Lines changed: 3 additions & 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎Example/CloudCoreExample.xcodeproj/project.pbxproj

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@
192192
isa = PBXProject;
193193
attributes = {
194194
LastSwiftUpdateCheck = 0820;
195-
LastUpgradeCheck = 0820;
195+
LastUpgradeCheck = 0900;
196196
ORGANIZATIONNAME = "Vasily Ulianov";
197197
TargetAttributes = {
198198
E2C3E34F1E53299800A733BF = {
199199
CreatedOnToolsVersion = 8.2.1;
200-
DevelopmentTeam = 7X2PJ6H6YM;
200+
LastSwiftMigration = 0900;
201201
ProvisioningStyle = Automatic;
202202
SystemCapabilities = {
203203
com.apple.BackgroundModes = {
@@ -335,15 +335,21 @@
335335
CLANG_CXX_LIBRARY = "libc++";
336336
CLANG_ENABLE_MODULES = YES;
337337
CLANG_ENABLE_OBJC_ARC = YES;
338+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
338339
CLANG_WARN_BOOL_CONVERSION = YES;
340+
CLANG_WARN_COMMA = YES;
339341
CLANG_WARN_CONSTANT_CONVERSION = YES;
340342
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
341343
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
342344
CLANG_WARN_EMPTY_BODY = YES;
343345
CLANG_WARN_ENUM_CONVERSION = YES;
344346
CLANG_WARN_INFINITE_RECURSION = YES;
345347
CLANG_WARN_INT_CONVERSION = YES;
348+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
349+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
346350
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
351+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
352+
CLANG_WARN_STRICT_PROTOTYPES = YES;
347353
CLANG_WARN_SUSPICIOUS_MOVE = YES;
348354
CLANG_WARN_UNREACHABLE_CODE = YES;
349355
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -384,15 +390,21 @@
384390
CLANG_CXX_LIBRARY = "libc++";
385391
CLANG_ENABLE_MODULES = YES;
386392
CLANG_ENABLE_OBJC_ARC = YES;
393+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
387394
CLANG_WARN_BOOL_CONVERSION = YES;
395+
CLANG_WARN_COMMA = YES;
388396
CLANG_WARN_CONSTANT_CONVERSION = YES;
389397
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
390398
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
391399
CLANG_WARN_EMPTY_BODY = YES;
392400
CLANG_WARN_ENUM_CONVERSION = YES;
393401
CLANG_WARN_INFINITE_RECURSION = YES;
394402
CLANG_WARN_INT_CONVERSION = YES;
403+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
404+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
395405
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
406+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
407+
CLANG_WARN_STRICT_PROTOTYPES = YES;
396408
CLANG_WARN_SUSPICIOUS_MOVE = YES;
397409
CLANG_WARN_UNREACHABLE_CODE = YES;
398410
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -423,13 +435,13 @@
423435
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
424436
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
425437
CODE_SIGN_ENTITLEMENTS = Resources/CloudCoreExample.entitlements;
426-
DEVELOPMENT_TEAM = 7X2PJ6H6YM;
438+
DEVELOPMENT_TEAM = "";
427439
INFOPLIST_FILE = Resources/Info.plist;
428440
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
429441
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
430-
PRODUCT_BUNDLE_IDENTIFIER = changeMe.change;
431442
PRODUCT_NAME = "$(TARGET_NAME)";
432-
SWIFT_VERSION = 3.0;
443+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
444+
SWIFT_VERSION = 4.0;
433445
};
434446
name = Debug;
435447
};
@@ -439,13 +451,13 @@
439451
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
440452
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
441453
CODE_SIGN_ENTITLEMENTS = Resources/CloudCoreExample.entitlements;
442-
DEVELOPMENT_TEAM = 7X2PJ6H6YM;
454+
DEVELOPMENT_TEAM = "";
443455
INFOPLIST_FILE = Resources/Info.plist;
444456
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
445457
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
446-
PRODUCT_BUNDLE_IDENTIFIER = changeMe.change;
447458
PRODUCT_NAME = "$(TARGET_NAME)";
448-
SWIFT_VERSION = 3.0;
459+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
460+
SWIFT_VERSION = 4.0;
449461
};
450462
name = Release;
451463
};

‎Example/CloudCoreExample.xcodeproj/xcshareddata/xcschemes/CloudCoreExample.xcscheme

Lines changed: 3 additions & 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Release"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

‎Example/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>LSRequiresIPhoneOS</key>

‎Example/Sources/AppDelegate.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
2828
// Enable uploading changed local data to CoreData
2929
CloudCore.observeCoreDataChanges(persistentContainer: self.persistentContainer, errorDelegate: self)
3030

31+
// Sync on startup if push notifications is missed, disabled etc
32+
// Also it acts as initial sync if no sync was done before
33+
CloudCore.fetchAndSave(container: persistentContainer, error: { (error) in
34+
print("\(error)")
35+
}) {
36+
NSLog("On-startup sync completed")
37+
}
38+
3139
return true
3240
}
3341

0 commit comments

Comments
 (0)