diff --git a/CHANGELOG.md b/CHANGELOG.md index 8993f43..fbbfa6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,32 @@ ## [Unreleased](https://github.com/danielgindi/ChartsRealm/tree/HEAD) -[Full Changelog](https://github.com/danielgindi/ChartsRealm/compare/v3.0.4...HEAD) +[Full Changelog](https://github.com/danielgindi/ChartsRealm/compare/v3.0.5...HEAD) **Closed issues:** +- Swift 4.1 and Realm 3.4 [\#22](https://github.com/danielgindi/ChartsRealm/issues/22) +- Swift 4.1 Xcode 9.3? [\#21](https://github.com/danielgindi/ChartsRealm/issues/21) +- Type 'RLMArray\' does not conform to protocol 'Sequence' [\#20](https://github.com/danielgindi/ChartsRealm/issues/20) +- Swift 4.0.3 compilation errors [\#18](https://github.com/danielgindi/ChartsRealm/issues/18) + +## [v3.0.5](https://github.com/danielgindi/ChartsRealm/tree/v3.0.5) (2018-02-05) +[Full Changelog](https://github.com/danielgindi/ChartsRealm/compare/v3.0.4...v3.0.5) + +**Closed issues:** + +- RealmSwift dependency locked to 2.10 [\#16](https://github.com/danielgindi/ChartsRealm/issues/16) +- ChartsRealm failed building on Xcode 9.2, swift 4.0.3 [\#13](https://github.com/danielgindi/ChartsRealm/issues/13) +- Carthage update/bootstrap download Swift 3.1 RealmSwift module for swift 4 [\#11](https://github.com/danielgindi/ChartsRealm/issues/11) - Can't push new pod version [\#8](https://github.com/danielgindi/ChartsRealm/issues/8) +**Merged pull requests:** + +- update carthage and pod info to 3.0.5 [\#19](https://github.com/danielgindi/ChartsRealm/pull/19) ([liuxuan30](https://github.com/liuxuan30)) +- Add a missing designated initializer inheritance for RealmBarDataSet [\#15](https://github.com/danielgindi/ChartsRealm/pull/15) ([liuxuan30](https://github.com/liuxuan30)) +- Sync with Xcode 9.2, Swift 4.0.3 [\#14](https://github.com/danielgindi/ChartsRealm/pull/14) ([liuxuan30](https://github.com/liuxuan30)) +- migrate ChartsRealmDemo and bugfix [\#12](https://github.com/danielgindi/ChartsRealm/pull/12) ([liuxuan30](https://github.com/liuxuan30)) + ## [v3.0.4](https://github.com/danielgindi/ChartsRealm/tree/v3.0.4) (2017-10-09) [Full Changelog](https://github.com/danielgindi/ChartsRealm/compare/v3.0.3...v3.0.4) diff --git a/Cartfile b/Cartfile index 6ecc82e..b778d5d 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "danielgindi/Charts" ~> 3.0.5 -github "realm/realm-cocoa" ~> 3.1.1 +github "danielgindi/Charts" ~> 3.1.1 +github "realm/realm-cocoa" ~> 3.7.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index f1a8d22..3fe9ae3 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "danielgindi/Charts" "v3.0.5" -github "realm/realm-cocoa" "v3.1.1" +github "danielgindi/Charts" "v3.1.1" +github "realm/realm-cocoa" "v3.7.1" diff --git a/ChartsRealm.podspec b/ChartsRealm.podspec index 6ae6320..b0c93e2 100644 --- a/ChartsRealm.podspec +++ b/ChartsRealm.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ChartsRealm" - s.version = "3.0.5" + s.version = "3.1.1" s.summary = "A Realm.io module for Charts" s.homepage = "https://github.com/danielgindi/ChartsRealm" s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } @@ -10,6 +10,6 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.11" s.source = { :git => "https://github.com/danielgindi/ChartsRealm.git", :tag => "v#{s.version}" } s.source_files = "ChartsRealm/Classes/**/*.swift", "ChartsRealm/Supporting Files/RLMSupport.swift" - s.dependency "Charts", "3.0.5" - s.dependency "RealmSwift", "~> 3.1.1" + s.dependency "Charts", "~> 3.1.1" + s.dependency "RealmSwift", "~> 3.7.1" end diff --git a/ChartsRealm.xcodeproj/project.pbxproj b/ChartsRealm.xcodeproj/project.pbxproj index ddfa05d..370619c 100644 --- a/ChartsRealm.xcodeproj/project.pbxproj +++ b/ChartsRealm.xcodeproj/project.pbxproj @@ -154,7 +154,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0940; TargetAttributes = { 06B120D41D811E6200D14B02 = { CreatedOnToolsVersion = 7.3.1; @@ -243,12 +243,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -305,12 +307,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme b/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme index a31d4f6..057fcbb 100644 --- a/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme +++ b/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -47,7 +46,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ChartsRealmDemo/ChartsRealmDemo.xcodeproj/project.pbxproj b/ChartsRealmDemo/ChartsRealmDemo.xcodeproj/project.pbxproj index 01ca99d..0f4aee4 100644 --- a/ChartsRealmDemo/ChartsRealmDemo.xcodeproj/project.pbxproj +++ b/ChartsRealmDemo/ChartsRealmDemo.xcodeproj/project.pbxproj @@ -392,6 +392,7 @@ 5B57BBAE1A9B26AA0036A6CC = { CreatedOnToolsVersion = 6.1.1; LastSwiftMigration = 0900; + ProvisioningStyle = Manual; }; }; }; @@ -628,12 +629,16 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS"; INFOPLIST_FILE = "Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealmDemo; PRODUCT_NAME = ChartsRealmDemo; + PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsRealmDemo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -649,12 +654,16 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS"; INFOPLIST_FILE = "Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealmDemo; PRODUCT_NAME = ChartsRealmDemo; + PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsRealmDemo-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; diff --git a/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json index 32d8413..6568fb7 100644 --- a/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json @@ -47,8 +47,9 @@ "scale" : "3x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "iTunesArtwork@2x.png", "scale" : "1x" } ], diff --git a/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png new file mode 100644 index 0000000..808316d Binary files /dev/null and b/ChartsRealmDemo/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ diff --git a/Gemfile.lock b/Gemfile.lock index aef7995..7b57187 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,57 +1,59 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.5) - activesupport (4.2.9) + CFPropertyList (3.0.0) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + atomos (0.1.2) claide (1.0.2) - cocoapods (1.3.1) + cocoapods (1.5.3) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.3.1) - cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-core (= 1.5.3) + cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-downloader (>= 1.2.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-trunk (>= 1.3.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) fourflusher (~> 2.0.1) gh_inspector (~> 1.0) - molinillo (~> 0.5.7) + molinillo (~> 0.6.5) nap (~> 1.0) ruby-macho (~> 1.1) - xcodeproj (>= 1.5.1, < 2.0) - cocoapods-core (1.3.1) + xcodeproj (>= 1.5.7, < 2.0) + cocoapods-core (1.5.3) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.3) + cocoapods-deintegrate (1.0.2) + cocoapods-downloader (1.2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.0.0) - cocoapods-trunk (1.2.0) + cocoapods-trunk (1.3.0) nap (>= 0.8, < 2.0) - netrc (= 0.7.8) + netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) + concurrent-ruby (1.0.5) escape (0.0.4) - faraday (0.13.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) fourflusher (2.0.1) fuzzy_match (2.0.4) - gh_inspector (1.0.3) + gh_inspector (1.1.3) github_changelog_generator (1.14.3) activesupport faraday-http-cache @@ -60,34 +62,35 @@ GEM rainbow (>= 2.1) rake (>= 10.0) retriable (~> 2.1) - i18n (0.8.6) - minitest (5.10.3) - molinillo (0.5.7) - multi_json (1.12.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + molinillo (0.6.5) + multi_json (1.13.1) multipart-post (2.0.0) - nanaimo (0.2.3) + nanaimo (0.2.5) nap (1.1.0) - netrc (0.7.8) - octokit (4.7.0) + netrc (0.11.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (3.0.0) - rainbow (2.2.2) - rake - rake (12.1.0) + public_suffix (3.0.2) + rainbow (3.0.0) + rake (12.3.1) retriable (2.1.0) rouge (2.0.7) - ruby-macho (1.1.0) + ruby-macho (1.2.0) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.5.2) - CFPropertyList (~> 2.3.3) + xcodeproj (1.5.9) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.3) + nanaimo (~> 0.2.5) xcpretty (0.2.8) rouge (~> 2.0.7) @@ -101,4 +104,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.15.4 + 1.16.1