From 871bccc78a564f793a377e7a504cfa8351fb9793 Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Sun, 11 Apr 2021 19:18:14 +0200 Subject: [PATCH 1/7] Bump minimal deployment target to iOS 9 --- RFISO8601DateTime.podspec | 2 +- RFISO8601DateTime.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFISO8601DateTime.podspec b/RFISO8601DateTime.podspec index 8b476db..b031470 100644 --- a/RFISO8601DateTime.podspec +++ b/RFISO8601DateTime.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/readefries/RFISO8601DateTime.git", :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/readefries' - s.platform = :ios, '8.0' + s.ios.deployment_target = '9.0' s.requires_arc = true s.source_files = 'RFISO8601DateTime/**/*.swift' diff --git a/RFISO8601DateTime.xcodeproj/project.pbxproj b/RFISO8601DateTime.xcodeproj/project.pbxproj index 5758aa7..323837b 100644 --- a/RFISO8601DateTime.xcodeproj/project.pbxproj +++ b/RFISO8601DateTime.xcodeproj/project.pbxproj @@ -302,7 +302,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -355,7 +355,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; From 2ee32d3b2adff76aa2f1cc0ec67536a666318b9b Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Sun, 11 Apr 2021 19:18:35 +0200 Subject: [PATCH 2/7] Use Podspec to specify Swift version --- .swift-version | 1 - RFISO8601DateTime.podspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 5186d07..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.0 diff --git a/RFISO8601DateTime.podspec b/RFISO8601DateTime.podspec index b031470..2a38513 100644 --- a/RFISO8601DateTime.podspec +++ b/RFISO8601DateTime.podspec @@ -10,6 +10,7 @@ Pod::Spec.new do |s| s.name = "RFISO8601DateTime" s.version = "3.0.3" s.summary = "A library to easily use ISO8601 date and time." + s.swift_version = "5.0" s.description = <<-DESC A small library that can automatically parse ISO8601/RFC3339/RFC2822 date and time. It extends NSDate and recognise different date and time formats using regular expression. From 343c264727b32c5e861041322b87d3ceb625975a Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Sun, 11 Apr 2021 19:20:56 +0200 Subject: [PATCH 3/7] Remove Travis build configuration --- .travis.yml | 26 --------------------- RFISO8601DateTime.xcodeproj/project.pbxproj | 4 ---- 2 files changed, 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d1c2e5d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: objective-c -osx_image: xcode10.2 -cache: -- bundler -script: -- xcodebuild test -project RFISO8601DateTime.xcodeproj -scheme RFISO8601DateTimeTests -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 7' -- bundle _2.0.1_ exec pod lib lint --quick -before_install: -- gem install -v 2.0.1 bundler -- bundle _2.0.1_ install -- brew update -- brew outdated carthage || brew upgrade carthage -before_deploy: -- carthage build --no-skip-current -- carthage archive RFISO8601DateTime -after_success: -- bash <(curl -s https://codecov.io/bash) -deploy: - provider: releases - api_key: - secure: Ltftl9EwrbjyO0u9ehSHQtwIZjni5KcUCXC6AO9q2Nrd4+xbhY3H6w4vfuz6AoavcDf92TiwDd4NIiImoPATDgxbvfP/eeWY3sFOjwFSoW6S7b30739Pem8Rw9vEy7I/Co55qfxomvxJFKfWbgWQHiY+LmPykVgI1XR2M1IHU2zT4oV4//5GbKPV0iWc6ir/pSQACdAsMhea/AMs7PbdbupjvZ9xeIuPAHnkEeNsO5WtdvG2+YZpNTEouABU+amR5noqjK0te0UnjRdnhN4MSbP4JEGZMEAgwiYkteILwt/e4MqHuuH3d66Vr7P7lriUW1dv60g1sEcfKxYzw5ZziiOUBBy+t1zTXJ1Z6JJQS7WQsuABsj3//xpaLsSG8Wk/C5UFZjTS4OLf0c0h9/MC60LOtrNp5xYmx6HeIpo80GUoGk7njDtBS0ycVxN2gjGqwJIwGVklodhJusmTzrXZ5A3MCexg6Pm7RD1td3yngptRqZlcje56VTH0wV+lWh3EMass8e+tSx/iO8FuSgKG4eE2agdpVvPT6F/wcsrlLn6R19nubNRMFY8io/kuytR+52gE2o5ibUGI6uB/sbqwkhDaR1bVSyH5/A92LjdDNsdt2/HJ1Dq81xnXNjHEWZss2zj60ZyEYIvneMVxIRBlQORlh6Z+BBq6FJmVEkfY+pw= - file: RFISO8601DateTime.framework.zip - skip_cleanup: true - on: - repo: readefries/RFISO8601DateTime - tags: true diff --git a/RFISO8601DateTime.xcodeproj/project.pbxproj b/RFISO8601DateTime.xcodeproj/project.pbxproj index 323837b..9418d2e 100644 --- a/RFISO8601DateTime.xcodeproj/project.pbxproj +++ b/RFISO8601DateTime.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ B14A56101C577E8C005201FE /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = B14A560F1C577E8C005201FE /* .gitignore */; }; B14A56141C577EE0005201FE /* RFISO8601DateTime.podspec in Resources */ = {isa = PBXBuildFile; fileRef = B14A56111C577EE0005201FE /* RFISO8601DateTime.podspec */; }; B14A56161C577EE0005201FE /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = B14A56131C577EE0005201FE /* LICENSE */; }; - B14A56181C577EF8005201FE /* .travis.yml in Resources */ = {isa = PBXBuildFile; fileRef = B14A56171C577EF8005201FE /* .travis.yml */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -45,7 +44,6 @@ B14A56111C577EE0005201FE /* RFISO8601DateTime.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RFISO8601DateTime.podspec; sourceTree = ""; }; B14A56121C577EE0005201FE /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; B14A56131C577EE0005201FE /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; - B14A56171C577EF8005201FE /* .travis.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .travis.yml; sourceTree = ""; }; B1A3FED51DDCE78000DA5D69 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; /* End PBXFileReference section */ @@ -72,7 +70,6 @@ isa = PBXGroup; children = ( B14A560F1C577E8C005201FE /* .gitignore */, - B14A56171C577EF8005201FE /* .travis.yml */, B1A3FED51DDCE78000DA5D69 /* CHANGELOG.md */, B14A56121C577EE0005201FE /* README.md */, B14A56111C577EE0005201FE /* RFISO8601DateTime.podspec */, @@ -210,7 +207,6 @@ files = ( B14A56161C577EE0005201FE /* LICENSE in Resources */, B14A56141C577EE0005201FE /* RFISO8601DateTime.podspec in Resources */, - B14A56181C577EF8005201FE /* .travis.yml in Resources */, B14A56101C577E8C005201FE /* .gitignore in Resources */, ); runOnlyForDeploymentPostprocessing = 0; From 72046895ddb518a02cbffeee675e62d3f2e1c77a Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Sun, 11 Apr 2021 19:27:25 +0200 Subject: [PATCH 4/7] Specify Ruby version --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..338a5b5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.6 From dc4d0f84880a16862454766ddeabd3e49feb8ae5 Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Mon, 12 Apr 2021 08:53:23 +0200 Subject: [PATCH 5/7] Update Readme to show results of unit tests in build pipeline --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cd4225..5a5e348 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RFISO8601DateTime -[![CI Status](http://img.shields.io/travis/readefries/RFISO8601DateTime.svg?style=flat)](https://travis-ci.org/readefries/RFISO8601DateTime) +[![Unit tests](https://github.com/readefries/RFISO8601DateTime/actions/workflows/check-pr.yml/badge.svg)](https://github.com/readefries/RFISO8601DateTime/actions/workflows/check-pr.yml) [![Version](https://img.shields.io/cocoapods/v/RFISO8601DateTime.svg?style=flat)](http://cocoapods.org/pods/RFISO8601DateTime) [![License](https://img.shields.io/cocoapods/l/RFISO8601DateTime.svg?style=flat)](http://cocoapods.org/pods/RFISO8601DateTime) [![Platform](https://img.shields.io/cocoapods/p/RFISO8601DateTime.svg?style=flat)](http://cocoapods.org/pods/RFISO8601DateTime) From 509822b8f545eca740a0d0305064b711d2bb4130 Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Mon, 12 Apr 2021 09:16:39 +0200 Subject: [PATCH 6/7] Make sure I use my current e-mail address, and not my deprecated one --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a5e348..200a018 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ pod 'RFISO8601DateTime', '~> 1.0' # Swift 2.3 ## Author -Hindrik Bruinsma, de@readefries.nl +Hindrik Bruinsma, hbruinsma@xs4some.nl ## License From 10af46ce1459c719f7a2fdd915d4b9790a5a2102 Mon Sep 17 00:00:00 2001 From: "Hindrik Bruinsma (Cloud Cosmonaut)" Date: Sun, 11 Apr 2021 19:24:08 +0200 Subject: [PATCH 7/7] Add Action to verify PR --- .github/workflows/check-pr.yml | 55 ++++++++++++++++++++++++++++++++++ RFISO8601DateTime.podspec | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/check-pr.yml diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml new file mode 100644 index 0000000..dd68fc0 --- /dev/null +++ b/.github/workflows/check-pr.yml @@ -0,0 +1,55 @@ +name: Check PR + +on: + pull_request: + branches: [ main ] + +env: + PROJECT_FILE: RFISO8601DateTime.xcodeproj + PROJECT_SCHEME: RFISO8601DateTimeTests + PODSPEC_FILE: RFISO8601DateTime.podspec + +jobs: + build: + + runs-on: macos-latest + + strategy: + matrix: + xcode: + - destination: platform=iOS Simulator,OS=latest,name=iPhone 11 + version : latest-stable + # - destination: platform=iOS Simulator,OS=14.4,name=iPhone 11 + # version: 12.4 + # - destination: platform=iOS Simulator,OS=13.7,name=iPhone 11 + # version: 11.7 + # - destination: platform=iOS Simulator,OS=12.4,name=iPhone 7 + # version: 10.3 + + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.head_ref }} + - uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: ${{ matrix.xcode.version }} + + - name: Xcode Test + uses: devbotsxyz/xcode-test@v1.1.0 + with: + project: ${{ env.PROJECT_FILE }} + scheme: ${{ env.PROJECT_SCHEME }} + configuration: Debug + destination: ${{ matrix.xcode.destination }} + + - uses: codecov/codecov-action@v1 + name: Determine code coverage with CodeCov + + - name: Sed new version in Podspec + run: sed -i "" -e 's||1.1.1|g' ${{ env.PODSPEC_FILE }} + + - name: Perform Cocoapod lib lint validation + run: bundle exec pod lib lint --quick --allow-warnings diff --git a/RFISO8601DateTime.podspec b/RFISO8601DateTime.podspec index 2a38513..70d0e30 100644 --- a/RFISO8601DateTime.podspec +++ b/RFISO8601DateTime.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "RFISO8601DateTime" - s.version = "3.0.3" + s.version = "" s.summary = "A library to easily use ISO8601 date and time." s.swift_version = "5.0" s.description = <<-DESC