Merge pull request #6 from fishbrain/5.0.0

Merge master with 5.0.0
fishbrain · Apr 10, 2024 · 1a152f8 · 1a152f8
2 parents aab1a24 + c08001b
commit 1a152f8
Show file tree

Hide file tree

Showing 339 changed files with 888 additions and 594 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -20,12 +20,12 @@
 
 ℹ Please replace this with of what happened instead.  
 
-## Charts Environment
+## DGCharts Environment
 
-**Charts version/Branch/Commit Number:**
+**DGCharts version/Branch/Commit Number:**
 **Xcode version:**
 **Swift version:**
-**Platform(s) running Charts:**
+**Platform(s) running DGCharts:**
 **macOS version running Xcode:**
 
 ## Demo Project

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -1,65 +1,81 @@
 name: Swift
 
 on:
+  workflow_dispatch:
   push:
     branches:
-      - master
+      - "*"
   pull_request:
     branches:
       - "*"
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  iOS:
-    runs-on: macos-latest
+  buildFramework:
+    name: Build framework
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=14.4,name=iPhone 12 Pro"] #, "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
+        target:
+          - destination: "OS=16.2,name=iPhone 14 Pro"
+            actions: "build test"
+          - destination: "OS=16.1,name=Apple TV 4K (3rd generation)"
+            actions: "build test"
+          - destination: "platform=macOS"
+            actions: "build"
     steps:
-      - uses: actions/checkout@v2
-      - name: iOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "Charts" -destination "${{ matrix.destination }}" clean test | xcpretty
+      - uses: actions/checkout@v3
+      - name: Build framework - ${{ matrix.target.destination }}
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "DGCharts" -destination "${{ matrix.target.destination }}" clean ${{ matrix.target.actions }} | xcpretty
 
-  tvOS:
-    runs-on: macos-latest
+  buildDemo:
+    name: Build demo
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=14.3,name=Apple TV 4K"]
+        target:
+          - scheme: "ChartsDemo-iOS"
+            destination: "OS=16.2,name=iPhone 14 Pro"
+          - scheme: "ChartsDemo-macOS"
+            destination: "platform=macOS"
     steps:
-      - uses: actions/checkout@v2
-      - name: tvOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "Charts" -destination "${{ matrix.destination }}" clean test | xcpretty
+      - uses: actions/checkout@v3
+      - name: Build demo - ${{ matrix.target.destination }}
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "${{ matrix.target.scheme }}" -destination "${{ matrix.target.destination }}" clean build | xcpretty
 
-  macOS_demo:
-    runs-on: macos-latest
+  spm:
+    name: Test with SPM
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v2
-      - name: macOS
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "ChartsDemo-macOS" -destination "platform=macOS" clean build | xcpretty
+      - uses: actions/checkout@v3
+      - name: SPM Test
+        run: swift build
 
-  iOS_demo:
-    runs-on: macos-latest
+  carthage:
+    name: Test with carthage
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-    strategy:
-      matrix:
-        destination: ["OS=14.4,name=iPhone 12 Pro"] #, "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v2
-      - name: iOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "ChartsDemo-iOS" -destination "${{ matrix.destination }}" clean build | xcpretty
+      - uses: actions/checkout@v3
+      - name: Carthage Test
+        run: carthage build --use-xcframeworks --no-skip-current
 
-  spm:
-    name: Test with SPM
-    runs-on: macos-latest
+  cocoapods:
+    name: Test with cocoapods
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v2
-      - name: SPM Test
-        run: swift build -c debug
+      - uses: actions/checkout@v3
+      - name: Carthage Test
+        run: pod lib lint
diff --git a/.gitignore b/.gitignore
@@ -71,6 +71,5 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 Carthage
-Charts.framework.zip
-ChartsRealm.framework.zip
+DGCharts.framework.zip
 .swiftpm/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,45 +1,45 @@
 # How to contribute
 
-Bug-fixes and features often come from users of the Charts framework, and improving it greatly. We want to keep it as easy as possible to contribute changes that improve the experience for users all around the world. There are a few guidelines that we
+Bug-fixes and features often come from users of the DGCharts framework, and improving it greatly. We want to keep it as easy as possible to contribute changes that improve the experience for users all around the world. There are a few guidelines that we
 need contributors to follow so that we can have a chance of keeping on
 top of things.
 
 ## Simple issues and bug reports
 
 If you are reporting a bug which can be observed visually, please add to your issue either:
 
-* Screenshots, if the bug is easily explainable
-* A working sample project that we can compile, run, and immediately observe the issue
+- Screenshots, if the bug is easily explainable
+- A working sample project that we can compile, run, and immediately observe the issue
 
 ## Getting Started with Contributions
 
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version (or commit number) that you know has the issue.
-* Fork the repository on GitHub
+- Make sure you have a [GitHub account](https://github.com/signup/free)
+- Submit a ticket for your issue, assuming one does not already exist.
+  - Clearly describe the issue including steps to reproduce when it is a bug.
+  - Make sure you fill in the earliest version (or commit number) that you know has the issue.
+- Fork the repository on GitHub
 
 ## Making Changes
 
-* Create a topic branch from where you want to base your work. This is usually the master branch.
-* Make commits of logical units.
-* Make sure your code conforms to the code style around it. It's easy, just look around!
-* If you have made changes back and forth, or have made merges, your commit history might look messy and hard to understand. A single issue or change should still be in one commit. So please squash those commits together and rebase them however you need to - to make our lives easier when reading it later.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
+- Create a topic branch from where you want to base your work. This is usually the master branch.
+- Make commits of logical units.
+- Make sure your code conforms to the code style around it. It's easy, just look around!
+- If you have made changes back and forth, or have made merges, your commit history might look messy and hard to understand. A single issue or change should still be in one commit. So please squash those commits together and rebase them however you need to - to make our lives easier when reading it later.
+- Check for unnecessary whitespace with `git diff --check` before committing.
+- Make sure your commit messages are in the proper format.
 
-````
+```
     First line must be up to 50 chars (Fixes #1234)
 
     The first line should be a short statement as to what have changed, and should also include an issue number, prefixed with a hash.
     The body of the message comes after an empty new line, and describes the changes
     more thoroughly, especially if there was a special case handled there,
     or maybe some trickery that only code wizards can understand.
-````
+```
 
-* Make sure you have tested your changes well.
-* If your changes could theoretically affect some other component or case, which you do not necessarily use, you still have to test it.
-* Create a Pull Request from your topic branch to the relevant branch in the main repo. If you go to the main repo of the framework, you'll see a big green button which pretty much prepares the PR for you. You just have to hit it.
+- Make sure you have tested your changes well.
+- If your changes could theoretically affect some other component or case, which you do not necessarily use, you still have to test it.
+- Create a Pull Request from your topic branch to the relevant branch in the main repo. If you go to the main repo of the framework, you'll see a big green button which pretty much prepares the PR for you. You just have to hit it.
 
 ## Making Trivial Changes