From 4180877c32f6f387352134b6197c90d6576e8ae3 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Airoldi Date: Fri, 11 Mar 2022 17:35:56 -0500 Subject: [PATCH] Update project settings to support publishing pod --- .github/workflows/swift.yml | 6 +++--- Charts.podspec | 9 +++++---- Charts.xcodeproj/project.pbxproj | 20 +++++++++---------- .../xcshareddata/xcschemes/Charts.xcscheme | 2 +- .../xcschemes/ChartsTests.xcscheme | 2 +- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- .../ChartsDemo-iOS.xcodeproj/project.pbxproj | 14 ++++++------- Package.swift | 8 ++++---- Source/Charts/Components/Marker.swift | 2 +- .../Formatters/AxisValueFormatter.swift | 2 +- Source/Charts/Formatters/ValueFormatter.swift | 2 +- Source/Charts/Highlight/Highlighter.swift | 2 +- .../Renderers/Scatter/ShapeRenderer.swift | 2 +- 13 files changed, 40 insertions(+), 39 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 938a11b606..716f44107e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -6,7 +6,7 @@ on: - master pull_request: branches: - - '*' + - "*" jobs: iOS: @@ -34,7 +34,7 @@ jobs: run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "Charts" -destination "${{ matrix.destination }}" clean test | xcpretty macOS_demo: - runs-on: macOS-latest + runs-on: macos-latest env: DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer steps: @@ -56,7 +56,7 @@ jobs: spm: name: Test with SPM - runs-on: macOS-latest + runs-on: macos-latest env: DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer steps: diff --git a/Charts.podspec b/Charts.podspec index 6fa80ed448..2a16f41b21 100644 --- a/Charts.podspec +++ b/Charts.podspec @@ -5,15 +5,16 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/danielgindi/Charts" s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } s.authors = "Daniel Cohen Gindi", "Philipp Jahoda" - s.ios.deployment_target = "9.0" - s.tvos.deployment_target = "9.0" - s.osx.deployment_target = "10.11" + s.ios.deployment_target = "12.0" + s.tvos.deployment_target = "12.0" + s.osx.deployment_target = "10.12" s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" } s.default_subspec = "Core" s.swift_version = '5.3' s.cocoapods_version = '>= 1.5.0' - + s.subspec "Core" do |ss| ss.source_files = "Source/Charts/**/*.swift" + ss.dependency 'SwiftAlgorithms', '~> 1.0' end end diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj index 18abb7650e..7f4626d7be 100644 --- a/Charts.xcodeproj/project.pbxproj +++ b/Charts.xcodeproj/project.pbxproj @@ -788,7 +788,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1320; TargetAttributes = { A58A4ED274A941CA248EA921 = { LastSwiftMigration = 1150; @@ -1032,7 +1032,7 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -1049,7 +1049,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1063,7 +1063,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = Tests/ChartsTests/Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1082,7 +1082,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1217,7 +1217,7 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -1234,7 +1234,7 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1248,7 +1248,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = Tests/ChartsTests/Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1267,7 +1267,7 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -1309,7 +1309,7 @@ repositoryURL = "https://github.com/apple/swift-algorithms"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.0.2; + minimumVersion = 1.0.0; }; }; 22BBDA0625CC4C2F00435670 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = { diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme index 393ece5592..51d7ee8d5c 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme @@ -1,6 +1,6 @@