Skip to content

Commit

Permalink
Merge pull request #37 from StarryInternet/fixup-project
Browse files Browse the repository at this point in the history
Update project to use xcode 16 folders, for easier maintenance between project and spm package. Add editorconfig file too, and bump swift version to 5.9
  • Loading branch information
klundberg authored Oct 31, 2024
2 parents ee13ce5 + 548018c commit f5855b8
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 271 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ concurrency:
cancel-in-progress: true

env:
DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_16.0.app/Contents/Developer"

jobs:
build-mac:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Update Tools
run: gem update cocoapods
- name: Print Versions
Expand All @@ -35,32 +35,32 @@ jobs:
pod --version
- name: Build
run: swift build --build-tests
- name: Run tests
- name: Test
run: swift test --skip-build
- name: Pod lint
run: pod lib lint
- name: Verify Carthage
run: carthage build --no-skip-current --verbose --use-xcframeworks --platform macOS
- name: Pod lint
run: pod lib lint

build-ios:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Test
run: |
set -o pipefail && xcodebuild \
-scheme CombineCoreBluetooth \
-workspace ./CombineCoreBluetooth.xcworkspace/ \
-destination "platform=iOS Simulator,OS=latest,name=iPhone 15" \
-destination "platform=iOS Simulator,OS=latest,name=iPhone 16" \
-sdk iphonesimulator \
-enableCodeCoverage YES \
-disableAutomaticPackageResolution \
test | xcpretty -c
build-tvos:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Test
run: |
set -o pipefail && xcodebuild \
Expand All @@ -73,24 +73,24 @@ jobs:
test | xcpretty -c
build-watchos:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Test
run: |
set -o pipefail && xcodebuild \
-scheme CombineCoreBluetooth \
-workspace ./CombineCoreBluetooth.xcworkspace/ \
-destination "platform=watchOS Simulator,OS=latest,name=Apple Watch Ultra (49mm)" \
-destination "platform=watchOS Simulator,OS=latest,name=Apple Watch Ultra 2 (49mm)" \
-sdk watchsimulator \
-enableCodeCoverage YES \
-disableAutomaticPackageResolution \
test | xcpretty -c
build-visionos:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Test
run: |
set -o pipefail && xcodebuild \
Expand Down
4 changes: 2 additions & 2 deletions CombineCoreBluetooth.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ Pod::Spec.new do |spec|
spec.license = { :type => 'MIT' }

spec.ios.deployment_target = '13.0'
spec.osx.deployment_target = '10.15'
spec.osx.deployment_target = '11.0'
spec.tvos.deployment_target = '13.0'
spec.watchos.deployment_target = '6.0'
spec.visionos.deployment_target = '1.0'

spec.swift_version = '5.6'
spec.swift_version = '5.9'
spec.source = { :git => 'https://github.com/StarryInternet/CombineCoreBluetooth.git', :tag => "#{spec.version}" }
spec.source_files = 'Sources/CombineCoreBluetooth/**/*.swift'

Expand Down
Loading

0 comments on commit f5855b8

Please sign in to comment.