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
96 changes: 96 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: CI

on:
push:
branches: [ main, master ]
pull_request:
branches: [ main, master ]

env:
LC_CTYPE: en_US.UTF-8
LANG: en_US.UTF-8

jobs:
test:
name: Test on iOS
runs-on: macos-latest

strategy:
matrix:
destination:
- "OS=18.0,name=iPhone 15"
- "OS=17.4,name=iPhone 14"
- "OS=16.4,name=iPhone 12"

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

- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16.4'

- name: Install xcpretty
run: gem install xcpretty

- name: Show Xcode version
run: xcodebuild -version

- name: Show available simulators
run: xcrun simctl list devices available

- name: Build and Test Framework (Debug)
run: |
set -o pipefail
xcodebuild -workspace "iOS Example/iOS Example.xcworkspace" \
-scheme "FDTake" \
-destination "${{ matrix.destination }}" \
-configuration Debug \
ONLY_ACTIVE_ARCH=NO \
ENABLE_TESTABILITY=YES \
test | xcpretty

- name: Build and Test Framework (Release)
run: |
set -o pipefail
xcodebuild -workspace "iOS Example/iOS Example.xcworkspace" \
-scheme "FDTake" \
-destination "${{ matrix.destination }}" \
-configuration Release \
ONLY_ACTIVE_ARCH=NO \
ENABLE_TESTABILITY=YES \
test | xcpretty

- name: Build Example App
run: |
set -o pipefail
xcodebuild -workspace "iOS Example/iOS Example.xcworkspace" \
-scheme "iOS Example" \
-destination "${{ matrix.destination }}" \
-configuration Debug \
ONLY_ACTIVE_ARCH=NO \
build | xcpretty

cocoapods:
name: CocoaPods Validation
runs-on: macos-latest

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

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true

- name: Install CocoaPods
run: gem install cocoapods

- name: Lint Podspec
run: pod lib lint --allow-warnings

- name: Check CocoaPods Quality
run: ruby Tests/CheckCocoaPodsQualityIndexes.rb FDTake
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.
#### Updated

- Now targeting iOS 10.3.3 or later
- Migrated from Travis CI to GitHub Actions for continuous integration
- Updated build environment from Xcode 11.2 to Xcode 15.4
- Updated iOS testing targets from iOS 13.2.2 to iOS 17.5, 16.4, and 14.5
- Updated Swift Package Manager tools version from 5.1 to 5.7

#### KNOWN ISSUES

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ When you commit a change, please add a note to [CHANGELOG.md](CHANGELOG.md).

## Release Process

1. Confirm the build is [passing in travis](https://travis-ci.org/fulldecent/FDTake)
1. Confirm the build is [passing in GitHub Actions](https://github.com/fulldecent/FDTake/actions)
1. This automatically checks that the Podfile is building
2. Push a release commit
1. Create a new Master section at the top
Expand Down
4 changes: 2 additions & 2 deletions FDTake.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ Pod::Spec.new do |s|
s.author = { "William Entriken" => "github.com@phor.net" }
s.source = { :git => "https://github.com/fulldecent/FDTake.git", :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/fulldecent'
s.platform = :ios, '10.0'
s.platform = :ios, '12.0'
s.requires_arc = true
s.swift_version = '5.0'
s.source_files = 'Sources/FDTake/**/*.swift'
s.resource_bundles = {
'Resources' => [
'Sources/FDTake/Resources/*.lproj'
'Resources/Resources/*.lproj'
]
}
end
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// swift-tools-version:5.1
// swift-tools-version:5.7

import PackageDescription

let package = Package(
name: "FDTake",
platforms: [.iOS(.v10)],
platforms: [.iOS(.v12)],
products: [
.library(
name: "FDTake",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# FDTake

[![CI Status](http://img.shields.io/travis/fulldecent/FDTake.svg?style=flat)](https://travis-ci.org/fulldecent/FDTake)
[![CI Status](https://github.com/fulldecent/FDTake/workflows/CI/badge.svg)](https://github.com/fulldecent/FDTake/actions)
[![Version](https://img.shields.io/cocoapods/v/FDTake.svg?style=flat)](http://cocoapods.org/pods/FDTake)
[![License](https://img.shields.io/cocoapods/l/FDTake.svg?style=flat)](http://cocoapods.org/pods/FDTake)
[![Platform](https://img.shields.io/cocoapods/p/FDTake.svg?style=flat)](http://cocoapods.org/pods/FDTake)
Expand Down Expand Up @@ -152,7 +152,7 @@ Other available options are documented at <a href="http://cocoadocs.org/docsets/
- Hungarian (thanks Andras Kadar)
- Please help translate <a href="https://github.com/fulldecent/FDTake/blob/master/FDTakeExample/en.lproj/FDTake.strings">`FDTake.strings`</a> to more languages
* Pure Swift support and iOS 8+ required
* Compile testing running on Travis CI
* Compile testing running on GitHub Actions
* In progress: functional test cases ([please help](https://github.com/fulldecent/FDTake/issues/72))
* In progress: UI test cases ([please help](https://github.com/fulldecent/FDTake/issues/72))

Expand Down
4 changes: 2 additions & 2 deletions Resources/FDTakeResources.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = net.phor.FDTakeResources;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -329,7 +329,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = net.phor.FDTakeResources;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
33 changes: 0 additions & 33 deletions Scripts/travis-ci.sh

This file was deleted.

8 changes: 4 additions & 4 deletions iOS Example/iOS Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -373,7 +373,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -389,7 +389,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -406,7 +406,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
Loading