diff --git a/.travis.yml b/.travis.yml index c360fe7..465858c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,21 +49,21 @@ after_success: - bash <(curl -s https://codecov.io/bash) before_script: - carthage bootstrap -before_deploy: - - carthage build --no-skip-current - - carthage archive SugarRecordRealm - - carthage archive SugarRecordCoreData -deploy: - - provider: releases - api_key: - secure: Ie2KeV7dK/7gNVomv/Z6d/KYexzOJusMtiLrHyk0WIYXJfWPa2/grwIJx5h9KmZw1T3+BYnlzpRvz1vUHvVroZ1iBNEZNKZFYdkATNeb8pRaQ76uVZrXV2idWOSH3l6YVJLqk3timwwMF3RI0gKL34Q/0IC9/3LDqhipUbqCXFg9LYWs8BRdc55Mk4xEPXCunXEjOquXYveTiFqEsPgjuCyuX0uv5HdlgNiSIZS8FCxCFrtAqoyEFeiQrY98O5zNUbW4qKhIz5Z+HRug/33euBXQX6DNTBrBgBwGwN+uJ/f5un2hC38aEcB30TMuFBLv9VR5HgRFQEKS0QOOn9tWJ8iuEZT9+LvR7/EUafJR9s1vN6cjrWhA8mskrYXiNVARN+Qr8h8LGeaKE2g/3hUIb3Z8ZNF9ljL4ThRKN8bxT4gSQF3aT00rwSawN97f3J01kPPx5vlDzBNGT+1dFJcKga9+7svwhCh6fQ+s3vGmWPmd/BR+9EuZOqJV4IgEz0LoNA/7IpQ6HHlyKpr6hoi/nbw+a6h2tixPWk7sLNGy8Gi73RUTpUPNDInq7/7c3oFlx+ideM5mZ8NNq9FJYUCaVNQghwYtWTO9yc7TOcjN0YDK4/jsf+2Evi1ird70PGOyVahpV42BwRyHCazEsSAMi5+lRGoe/B0ewsRK9zbomJ4= - file: - - SugarRecordRealm.framework.zip - - SugarRecordCoreData.framework.zip - on: - repo: pepibumur/SugarRecord - tags: true - - provider: script - script: ./script/push - on: - tags: true +# before_deploy: +# - carthage build --no-skip-current +# - carthage archive SugarRecordRealm +# - carthage archive SugarRecordCoreData +# deploy: +# - provider: releases +# api_key: +# secure: Ie2KeV7dK/7gNVomv/Z6d/KYexzOJusMtiLrHyk0WIYXJfWPa2/grwIJx5h9KmZw1T3+BYnlzpRvz1vUHvVroZ1iBNEZNKZFYdkATNeb8pRaQ76uVZrXV2idWOSH3l6YVJLqk3timwwMF3RI0gKL34Q/0IC9/3LDqhipUbqCXFg9LYWs8BRdc55Mk4xEPXCunXEjOquXYveTiFqEsPgjuCyuX0uv5HdlgNiSIZS8FCxCFrtAqoyEFeiQrY98O5zNUbW4qKhIz5Z+HRug/33euBXQX6DNTBrBgBwGwN+uJ/f5un2hC38aEcB30TMuFBLv9VR5HgRFQEKS0QOOn9tWJ8iuEZT9+LvR7/EUafJR9s1vN6cjrWhA8mskrYXiNVARN+Qr8h8LGeaKE2g/3hUIb3Z8ZNF9ljL4ThRKN8bxT4gSQF3aT00rwSawN97f3J01kPPx5vlDzBNGT+1dFJcKga9+7svwhCh6fQ+s3vGmWPmd/BR+9EuZOqJV4IgEz0LoNA/7IpQ6HHlyKpr6hoi/nbw+a6h2tixPWk7sLNGy8Gi73RUTpUPNDInq7/7c3oFlx+ideM5mZ8NNq9FJYUCaVNQghwYtWTO9yc7TOcjN0YDK4/jsf+2Evi1ird70PGOyVahpV42BwRyHCazEsSAMi5+lRGoe/B0ewsRK9zbomJ4= +# file: +# - SugarRecordRealm.framework.zip +# - SugarRecordCoreData.framework.zip +# on: +# repo: pepibumur/SugarRecord +# tags: true +# - provider: script +# script: ./script/push +# on: +# tags: true diff --git a/SugarRecord.xcodeproj/project.pbxproj b/SugarRecord.xcodeproj/project.pbxproj index ce064cf..6614a4b 100644 --- a/SugarRecord.xcodeproj/project.pbxproj +++ b/SugarRecord.xcodeproj/project.pbxproj @@ -228,6 +228,10 @@ 23554C0D1C2F348700DAAF3F /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23554C0B1C2F348700DAAF3F /* Quick.framework */; }; 23554C0E1C2F348F00DAAF3F /* Nimble.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 23554C0A1C2F348700DAAF3F /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 23554C0F1C2F348F00DAAF3F /* Quick.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 23554C0B1C2F348700DAAF3F /* Quick.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 237A93CB1C626ABF006BC2F1 /* CoreDataiCloudStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 238863791C5C239C0048B691 /* CoreDataiCloudStorage.swift */; }; + 237A93CC1C626AC0006BC2F1 /* CoreDataiCloudStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 238863791C5C239C0048B691 /* CoreDataiCloudStorage.swift */; }; + 237A93CD1C626AC8006BC2F1 /* iCloudConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2388637E1C5C285F0048B691 /* iCloudConfig.swift */; }; + 237A93CE1C626AC9006BC2F1 /* iCloudConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2388637E1C5C285F0048B691 /* iCloudConfig.swift */; }; 239C8E051BF48B680025DB9A /* ContextParent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239C8E041BF48B680025DB9A /* ContextParent.swift */; }; 239C8E061BF48B680025DB9A /* ContextParent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239C8E041BF48B680025DB9A /* ContextParent.swift */; }; 23A916751C17365A005E57D8 /* DirUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23A916741C17365A005E57D8 /* DirUtilsTests.swift */; }; @@ -1821,7 +1825,9 @@ 2319B86A1C2401F80050ABE8 /* Error.swift in Sources */, 2319B86B1C2401F80050ABE8 /* RequestExtension.swift in Sources */, 2319B86C1C2401F80050ABE8 /* NSPredicateConvertible.swift in Sources */, + 237A93CB1C626ABF006BC2F1 /* CoreDataiCloudStorage.swift in Sources */, 2319B86D1C2401F80050ABE8 /* NSSortDescriptorConvertible.swift in Sources */, + 237A93CD1C626AC8006BC2F1 /* iCloudConfig.swift in Sources */, 2319B86E1C2401F80050ABE8 /* Context.swift in Sources */, 2319B86F1C2401F90050ABE8 /* Entity.swift in Sources */, 2319B8701C2401F90050ABE8 /* Requestable.swift in Sources */, @@ -1851,7 +1857,9 @@ 2319B8BF1C2402960050ABE8 /* Store.swift in Sources */, 2319B8C01C2402960050ABE8 /* Options.swift in Sources */, 2319B8C11C2402960050ABE8 /* ContextParent.swift in Sources */, + 237A93CC1C626AC0006BC2F1 /* CoreDataiCloudStorage.swift in Sources */, 2319B8C21C2402960050ABE8 /* CoreDataErrors.swift in Sources */, + 237A93CE1C626AC9006BC2F1 /* iCloudConfig.swift in Sources */, 2319B8C31C2402960050ABE8 /* NSManagedObject.swift in Sources */, 2319B8C41C2402960050ABE8 /* NSManagedObjectContext.swift in Sources */, 2319B8C51C2402960050ABE8 /* NSManagedObjectMemoryContext.swift in Sources */, diff --git a/SugarRecord/Source/CoreData/Entities/iCloudConfig.swift b/SugarRecord/Source/CoreData/Entities/iCloudConfig.swift index 5f19572..a4b9239 100644 --- a/SugarRecord/Source/CoreData/Entities/iCloudConfig.swift +++ b/SugarRecord/Source/CoreData/Entities/iCloudConfig.swift @@ -30,4 +30,4 @@ public struct iCloudConfig { self.ubiquitousContainerIdentifier = ubiquitousContainerIdentifier self.rebuildFromUbiquitousContentOption = rebuildFromUbiquitousContentOption } -} \ No newline at end of file +}