Skip to content

Commit

Permalink
Merge pull request #4 from touchlane/update-swift-5.0
Browse files Browse the repository at this point in the history
Update swift 5.0
  • Loading branch information
vkondrashkov authored Oct 9, 2019
2 parents 7e3ba95 + 00b846b commit 64e2ca6
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os: osx
osx_image: xcode10
osx_image: xcode11
language: objective-c

deploy:
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog for ExpandableLayout 0.0.2
# Changelog for CampcotCollectionView 0.0.4
### Changed
* Updates for Swift 5.0

# Changelog for CampcotCollectionView 0.0.2
### Added
* Example UI update.

# Changelog for ExpandableLayout 0.0.1
# Changelog for CampcotCollectionView 0.0.1
### Added
* Initial setup.
2 changes: 1 addition & 1 deletion CampcotCollectionView.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'CampcotCollectionView'
s.version = '0.0.3'
s.version = '0.0.4'
s.summary = 'CapmcotCollectionView is custom UICollectionView that allows to expand and collapse sections.'
s.description = 'This library provides a custom UICollectionView that allows to expand and collapse sections.' \
'It provides a simple API to manage collection view appearance.'
Expand Down
12 changes: 6 additions & 6 deletions CampcotCollectionView.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@
TargetAttributes = {
DD35D92C201B57C80049ED03 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
DD35D935201B57C80049ED03 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -403,7 +403,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -425,7 +425,7 @@
PRODUCT_BUNDLE_IDENTIFIER = io.touchlane.CampcotCollectionView;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -439,7 +439,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.touchlane.CampcotCollectionViewTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -453,7 +453,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.touchlane.CampcotCollectionViewTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
6 changes: 3 additions & 3 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
TargetAttributes = {
DD35D953201B5F390049ED03 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -361,7 +361,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.touchlane.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -376,7 +376,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.touchlane.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ This library provides a custom `UICollectionView` that allows to expand and coll
# Requirements

* iOS 9.0+
* Xcode 9.0+
* Swift 4.2+
* Xcode 10.2+
* Swift 5.0+

# Installation

Expand Down
2 changes: 1 addition & 1 deletion Source/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.0.3</string>
<string>0.0.4</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit 64e2ca6

Please sign in to comment.