Skip to content

@import CorePlot #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eskroch merged 4 commits into from
Dec 14, 2020
Merged

@import CorePlot #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4480fe
fixed package name so you can @import CorePlot instead of `@import co…
3a4oT Dec 13, 2020
982540e
Merge remote-tracking branch 'upstream/release-2.4' into spm
3a4oT Dec 13, 2020
df273ce
fixed CI
3a4oT Dec 13, 2020
f071267
removed static lib tests from CI since it was removed from main repo
3a4oT Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ jobs:

- name: Run unit tests for tvOS
run: xcodebuild -project framework/CorePlot.xcodeproj -target "UnitTests tvOS" -sdk "appletvsimulator" -destination "name=Apple TV 4K" -configuration Release ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO

- name: Run unit tests for CorePlot-CocoaTouch
run: xcodebuild -project framework/CorePlot.xcodeproj -target "CorePlot-CocoaTouchTests" -sdk "iphonesimulator" -destination "name=iPhone 12 Pro" -configuration Release ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO


SPM:
name: Verify SPM build
runs-on: macOS-latest
Expand All @@ -44,7 +41,7 @@ jobs:
"platform=macOS",
"platform=tvOS Simulator,name=Apple TV 4k",
]
scheme: ["core-plot"]
scheme: ["CorePlot"]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import PackageDescription

let package = Package(
name: "core-plot",
name: "CorePlot",
platforms: [
.macOS(.v10_12),
.iOS(.v10),
Expand All @@ -13,8 +13,8 @@ let package = Package(
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "core-plot",
targets: ["core-plot"]),
name: "CorePlot",
targets: ["CorePlot"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
Expand All @@ -24,7 +24,7 @@ let package = Package(
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "core-plot",
name: "CorePlot",
dependencies: [],
path: "spm/Sources/core-plot"),
]
Expand Down