diff --git a/CHANGELOG.md b/CHANGELOG.md index 679cecacb4..16ba642747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [v2.3.0](https://github.com/danielgindi/charts/tree/v2.3.0) (2016-09-20) +[Full Changelog](https://github.com/danielgindi/charts/compare/v2.3.0...v2.2.5) + +**Implemented enhancements:** + +- Support for Xcode 8 and Swift 2.3 + ## [v2.2.5](https://github.com/danielgindi/charts/tree/v2.2.5) (2016-05-29) [Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.5...v2.2.4) diff --git a/Charts.podspec b/Charts.podspec index 750397e504..0080802d33 100644 --- a/Charts.podspec +++ b/Charts.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Charts" - s.version = "2.2.5" + s.version = "2.3.0" s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)" s.homepage = "https://github.com/danielgindi/Charts" s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } diff --git a/README.md b/README.md index 0ba3c26f4a..6e097e9dfe 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,32 @@ -**Version 2.2.5**, synced to [MPAndroidChart #1b9b3da](https://github.com/PhilJay/MPAndroidChart/commit/1b9b3da) +**Version 2.3.0**, synced to [MPAndroidChart #1b9b3da](https://github.com/PhilJay/MPAndroidChart/commit/1b9b3da) ![alt tag](https://raw.github.com/danielgindi/Charts/master/Assets/feature_graphic.png) ![Supported Platforms](https://img.shields.io/cocoapods/p/Charts.svg) [![Releases](https://img.shields.io/github/release/danielgindi/Charts.svg)](https://github.com/danielgindi/Charts/releases) [![Latest pod release](https://img.shields.io/cocoapods/v/Charts.svg)](http://cocoapods.org/pods/charts) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Build Status](https://travis-ci.org/danielgindi/Charts.svg?branch=master)](https://travis-ci.org/danielgindi/Charts) [![Join the chat at https://gitter.im/danielgindi/Charts](https://badges.gitter.im/danielgindi/Charts.svg)](https://gitter.im/danielgindi/Charts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -## Just a heads up: We've renamed from *ios-charts* to **Charts**. - -* Xcode 7.3 / Swift 2.2 / 3.0 -* iOS 7.0 (Drag .swift files to your project) -* iOS 8.0 / 9.0 (Use as an **Embedded** Framework) -* tvOS 9.0 -* OSX 10.11 +* Xcode 8.0 / Swift 2.3 +* iOS >= 8.0 (Use as an **Embedded** Framework) +* tvOS >= 9.0 +* macOS >= 10.11 Okay so there's this beautiful library called [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) by [Philipp Jahoda](https://www.linkedin.com/in/philippjahoda) which has become very popular amongst Android developers, and in the meanwhile there's no decent charting solution for iOS. I've chosen to write it in `Swift` as it can be highly optimized by the compiler, and can be used in both `Swift` and `ObjC` project. The demo project is written in `ObjC` to demonstrate how it works. -**An amazing feature** of this library now, for Android, iOS, tvOS and OSX, is the time it saves you when developing for both platforms, as the learning curve is singleton- it happens only once, and the code stays very similar so developers don't have to go around and re-invent the app to produce the same output with a different library. (And that's not even considering the fact that there's not really another good choice out there currently...) +**An amazing feature** of this library now, for Android, iOS, tvOS and macOS, is the time it saves you when developing for both platforms, as the learning curve is singleton- it happens only once, and the code stays very similar so developers don't have to go around and re-invent the app to produce the same output with a different library. (And that's not even considering the fact that there's not really another good choice out there currently...) + +## Having trouble running the demo? + +* `ChartsDemo/ChartsDemo.xcodeproj` is the demo project for iOS/tvOS +* `ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj` is the demo project for macOS +* Make sure you are running a supported version of Xcode. + * Usually it is specified here a few lines above. + * In most cases it will be the latest Xcode version. +* Make sure that your project supports Swift 2.3 +* Run `carthage checkout` in the project folder, to fetch dependencies (i.e Realm). + * Realm is not required for using Charts - it is just a feature. But as the demo demonstrates Realm - you have to have it when running the demo. + * If you don't have Carthage - you can get it [here](https://github.com/Carthage/Carthage/releases). + ## Usage @@ -24,20 +34,13 @@ In order to correctly compile: 1. Drag the `Charts.xcodeproj` to your project 2. Go to your target's settings, hit the "+" under the "Embedded Binaries" section, and select the Charts.framework -3. **Temporary workaround**: Xcode 6.3.1 has a bug, where you have to build your project once before actually writing the `@import` line. So hit "Build" now! -4. `@import Charts` -5. When using Swift in an ObjC project: +3. `@import Charts` +4. When using Swift in an ObjC project: - You need to import your Bridging Header. Usually it is "*YourProject-Swift.h*", so in ChartsDemo it's "*ChartsDemo-Swift.h*". Do not try to actually include "*ChartsDemo-Swift.h*" in your project :-) - Under "Build Options", mark "Embedded Content Contains Swift Code" -6. When using [Realm.io](https://realm.io/): +5. When using [Realm.io](https://realm.io/): - Note that the Realm framework is not linked with Charts - it is only there for *optional* bindings. Which means that you need to have the framework in your project, and in a compatible version to whatever is compiled with Charts. We will do our best to always compile against the latest version. - -If you want to compile for iOS 7: - -1. Drag the code itself (.swift files) to your project. As sadly, Swift currently does not support compiling Frameworks for iOS 7. -2. Make sure that the files are added to the Target membership. - ## Troubleshooting #### Can't compile? @@ -70,8 +73,8 @@ pod 'Charts/Realm' Charts now include Carthage prebuilt binaries. ```carthage -github "danielgindi/Charts" == 2.2.5 -github "danielgindi/Charts" ~> 2.2.5 +github "danielgindi/Charts" == 2.3.0 +github "danielgindi/Charts" ~> 2.3.0 ``` In order to build the binaries for a new release, use `carthage build --no-skip-current && carthage archive Charts && carthage archive ChartsRealm`. @@ -176,7 +179,7 @@ Features Documentation ======= -Currently there's no need for documentation for the iOS/tvOS/OSX version, as the API is **95% the same** as on Android. +Currently there's no need for documentation for the iOS/tvOS/macOS version, as the API is **95% the same** as on Android. You can read the official [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) documentation here: [**Wiki**](https://github.com/PhilJay/MPAndroidChart/wiki) Or you can see the [**ChartsDemo**](https://github.com/danielgindi/Charts/tree/master/ChartsDemo) project and learn the how-tos from it. @@ -201,4 +204,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. +limitations under the License. \ No newline at end of file diff --git a/Source/Supporting Files/Info.plist b/Source/Supporting Files/Info.plist index 56486c37ad..92fd419d9c 100644 --- a/Source/Supporting Files/Info.plist +++ b/Source/Supporting Files/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.5 + 2.3.0 CFBundleSignature ???? CFBundleVersion - 21 + 22 NSPrincipalClass