Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions .github/workflows/github-actions-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ jobs:
CI:
# ℹ️ Available GitHub Actions Runner Images
# https://github.com/actions/runner-images
runs-on: macos-13
runs-on: macos-15

steps:
- name: Checkout
uses: actions/checkout@v2

- run: bundle install
- run: pod install --repo-update

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

- name: fastlane
run: set -o pipefail && bundle exec fastlane travis
run: set -o pipefail && fastlane travis

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

Expand Down
3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

287 changes: 0 additions & 287 deletions Gemfile.lock

This file was deleted.

1 change: 1 addition & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ let package = Package(
],
products: [
.library(name: "FlexLayout", targets: ["FlexLayout"]),
.library(name: "FlexLayout-Dynamic", type: .dynamic, targets: ["FlexLayout"]),
],
dependencies: [
.package(url: "https://github.com/facebook/yoga.git", .upToNextMinor(from: "3.2.1")),
Expand Down
11 changes: 7 additions & 4 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ platform :ios do
before_all do
end

DEVICE_NAME = 'iPhone 17'
DESTINATION = "platform=iOS Simulator,name=#{DEVICE_NAME}"

lane :install do
bundle_install

Expand All @@ -39,7 +42,7 @@ platform :ios do
configuration: 'Release',
build: true,
clean: true,
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
destination: DESTINATION
)

# FlexLayoutSample from FlexLayout.xcworkspace
Expand All @@ -49,7 +52,7 @@ platform :ios do
configuration: 'Release',
build: true,
# clean: true,
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
destination: DESTINATION
)

# Example SPM (Swift Package Manager)
Expand All @@ -59,12 +62,12 @@ platform :ios do
configuration: 'Release',
build: true,
clean: true,
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
destination: DESTINATION
)
end

lane :tests do
scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: 'iPhone 15')
scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: DEVICE_NAME)
end

lane :doc do
Expand Down