Skip to content

Commit 6b64757

Browse files
authored
Merge pull request #284 from heoblitz/feature/support_spm_dynamic_linking
Add support for SPM dynamic linking
2 parents fe74d5a + 025d7eb commit 6b64757

File tree

5 files changed

+12
-299
lines changed

5 files changed

+12
-299
lines changed

.github/workflows/github-actions-ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@ jobs:
55
CI:
66
# ℹ️ Available GitHub Actions Runner Images
77
# https://github.com/actions/runner-images
8-
runs-on: macos-13
8+
runs-on: macos-15
99

1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v2
1313

14-
- run: bundle install
1514
- run: pod install --repo-update
1615

17-
- name: Set Xcode Version 15.1.0 (iOS 17)
18-
run: sudo xcode-select -s /Applications/Xcode_15.1.app
16+
- name: Set Xcode Version 16.4.0
17+
run: sudo xcode-select -s /Applications/Xcode_16.4.0.app
1918

2019
- name: fastlane
21-
run: set -o pipefail && bundle exec fastlane travis
20+
run: set -o pipefail && fastlane travis
2221

2322
- run: bash <(curl -s https://codecov.io/bash) -J 'FlexLayout' -J 'FlexLayoutTests'
2423

Gemfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 287 deletions
This file was deleted.

Package.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ let package = Package(
1010
],
1111
products: [
1212
.library(name: "FlexLayout", targets: ["FlexLayout"]),
13+
.library(name: "FlexLayout-Dynamic", type: .dynamic, targets: ["FlexLayout"]),
1314
],
1415
dependencies: [
1516
.package(url: "https://github.com/facebook/yoga.git", .upToNextMinor(from: "3.2.1")),

fastlane/Fastfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ platform :ios do
1515
before_all do
1616
end
1717

18+
DEVICE_NAME = 'iPhone 17'
19+
DESTINATION = "platform=iOS Simulator,name=#{DEVICE_NAME}"
20+
1821
lane :install do
1922
bundle_install
2023

@@ -39,7 +42,7 @@ platform :ios do
3942
configuration: 'Release',
4043
build: true,
4144
clean: true,
42-
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
45+
destination: DESTINATION
4346
)
4447

4548
# FlexLayoutSample from FlexLayout.xcworkspace
@@ -49,7 +52,7 @@ platform :ios do
4952
configuration: 'Release',
5053
build: true,
5154
# clean: true,
52-
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
55+
destination: DESTINATION
5356
)
5457

5558
# Example SPM (Swift Package Manager)
@@ -59,12 +62,12 @@ platform :ios do
5962
configuration: 'Release',
6063
build: true,
6164
clean: true,
62-
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
65+
destination: DESTINATION
6366
)
6467
end
6568

6669
lane :tests do
67-
scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: 'iPhone 15')
70+
scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: DEVICE_NAME)
6871
end
6972

7073
lane :doc do

0 commit comments

Comments
 (0)