Skip to content

Commit 949f0b6

Browse files
authored
Merge pull request #115 from AliSoftware/update/project
Update Project and Tools to latest versions
2 parents a87f531 + 03a4128 commit 949f0b6

37 files changed

Lines changed: 749 additions & 580 deletions

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defaults:
22
- &default-config
33
macos:
4-
xcode: 11.1.0
4+
xcode: 12.5.1
55
shell: /bin/bash --login -eo pipefail
66
environment:
77
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
@@ -14,7 +14,7 @@ defaults:
1414
- &set-ruby-version
1515
run:
1616
name: Set Ruby Version
17-
command: echo 'chruby ruby-2.6.4' >> ~/.bash_profile
17+
command: echo 'chruby ruby-2.7.3' >> ~/.bash_profile
1818
- &restore-gems
1919
restore_cache:
2020
keys:

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
## main branch
44

5-
* Fix Xcode 12.5 warnings about the class keyword for protocol inheritance that is deprecated.
6-
[@johnarn](https://github.com/johnarn)
5+
* Update `Package.swift` and `.podspec` to use newer min iOS version supported by Xcode 12+.
76
[@AliSoftware](https://github.com/AliSoftware)
7+
[#115](https://github.com/AliSoftware/Reusable/pull/115)
8+
9+
* Fix Xcode 12.5 warnings about the class keyword for protocol inheritance that is deprecated.
10+
[@johnarn](https://github.com/johnarn)
811
[#113](https://github.com/AliSoftware/Reusable/pull/113)
912

1013
## 4.1.1

Example/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use_frameworks!
22

33
target 'ReusableDemo iOS' do
4-
platform :ios, '8.0'
4+
platform :ios, '12.0'
55
pod 'Reusable', :path => '../'
66
end
77

88
target 'ReusableDemo tvOS' do
9-
platform :tvos, '9.0'
9+
platform :tvos, '12.0'
1010
pod 'Reusable', :path => '../'
1111
end
1212

Example/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ EXTERNAL SOURCES:
1313
:path: "../"
1414

1515
SPEC CHECKSUMS:
16-
Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
16+
Reusable: f771553a196486f805c466812d06a5b0735dbda6
1717

18-
PODFILE CHECKSUM: 0bd0b2356bb3b5810dfd8bef84ec4a18a8f93156
18+
PODFILE CHECKSUM: ae97c8d84b9148534471b041a33cec1ba3620b65
1919

20-
COCOAPODS: 1.8.4
20+
COCOAPODS: 1.11.0

Example/Pods/Local Podspecs/Reusable.podspec.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 416 additions & 382 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Reusable-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Reusable-tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Pods-ReusableDemo iOS/Pods-ReusableDemo iOS-frameworks-Debug-input-files.xcfilelist

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)