diff --git a/Cartfile b/Cartfile index 6613c0f..1e6745c 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "realm/realm-cocoa" ~> 4.4 +github "realm/realm-cocoa" ~> 5.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 88f5bed..1e49ab5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "realm/realm-cocoa" "v4.4.0" +github "realm/realm-cocoa" "v5.3.3" diff --git a/DAO.podspec b/DAO.podspec index 949ef35..d667eee 100644 --- a/DAO.podspec +++ b/DAO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DAO' - s.version = '1.4.1' + s.version = '1.5.0' s.summary = 'DAO Library' s.description = 'Library provides easy way to cache entities.' s.homepage = 'https://github.com/RedMadRobot/DAO' @@ -8,12 +8,12 @@ Pod::Spec.new do |s| s.author = { 'vani2' => 'iv@redmadrobot.com', 'hoppus' => 'e.popov@redmadrobot.com' } s.source = { :git => 'https://github.com/RedMadRobot/DAO.git', :tag => s.version, :submodules => true } s.platform = :ios, '9.0' - s.swift_version = '5.2' + s.swift_version = '5.3' s.source_files = 'DAO/Classes/Core/**/*' s.subspec 'Realm' do |r| r.source_files = 'DAO/Classes/RealmDAO/**/*', 'DAO/Classes/Core/**/*' - r.dependency "RealmSwift", '~> 4.4' + r.dependency "RealmSwift", '~> 5.3' end s.subspec 'CoreData' do |cd| diff --git a/DAO.xcodeproj/project.pbxproj b/DAO.xcodeproj/project.pbxproj index ea5d71c..3f81932 100644 --- a/DAO.xcodeproj/project.pbxproj +++ b/DAO.xcodeproj/project.pbxproj @@ -451,6 +451,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -529,6 +530,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ru.redmadrobot.RealmDAO; @@ -609,6 +611,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -683,6 +686,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ru.redmadrobot.CoreDataDAO; diff --git a/DAO/Supporting Files/Info.plist b/DAO/Supporting Files/Info.plist index 9bcb244..c0701c6 100644 --- a/DAO/Supporting Files/Info.plist +++ b/DAO/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Example/DAO.xcodeproj/project.pbxproj b/Example/DAO.xcodeproj/project.pbxproj index 4266cf4..eb87855 100644 --- a/Example/DAO.xcodeproj/project.pbxproj +++ b/Example/DAO.xcodeproj/project.pbxproj @@ -746,7 +746,7 @@ INFOPLIST_FILE = DAO/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.4.1; + MARKETING_VERSION = 1.5.0; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -763,7 +763,7 @@ INFOPLIST_FILE = DAO/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.4.1; + MARKETING_VERSION = 1.5.0; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 2f8595a..b9d205b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,15 +1,15 @@ PODS: - - DAO (1.3.13): - - DAO/CoreData (= 1.3.13) - - DAO/Realm (= 1.3.13) - - DAO/CoreData (1.3.13) - - DAO/Realm (1.3.13): - - RealmSwift (~> 4.4) - - Realm (4.4.0): - - Realm/Headers (= 4.4.0) - - Realm/Headers (4.4.0) - - RealmSwift (4.4.0): - - Realm (= 4.4.0) + - DAO (1.4.1): + - DAO/CoreData (= 1.4.1) + - DAO/Realm (= 1.4.1) + - DAO/CoreData (1.4.1) + - DAO/Realm (1.4.1): + - RealmSwift (~> 5.3) + - Realm (5.3.3): + - Realm/Headers (= 5.3.3) + - Realm/Headers (5.3.3) + - RealmSwift (5.3.3): + - Realm (= 5.3.3) DEPENDENCIES: - DAO (from `../`) @@ -24,10 +24,10 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - DAO: efa55ad9eafc2ccf302c7f55142e570a1ad1170b - Realm: e125f464884cda953ebefe70c671b75b03b81b9b - RealmSwift: 33656a42bd300959a081fc13347376bc478071af + DAO: 027d2c1e53cebecf5c41e494a44a057cb373ebe0 + Realm: 2d57ea355bf8ca2a0964d6bfb38d28d7ff2addf6 + RealmSwift: 0a709536ecea30eea1d3c514f6ade2ed078dee3c PODFILE CHECKSUM: 304d7b9f54070467c355fe795db431630f017f61 -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3