Skip to content

Commit

Permalink
Revert "Add support for Swift Package Manager. (#19)"
Browse files Browse the repository at this point in the history 
This reverts commit ac3db24.

Swift Package Manager does not support Bundles, which we use for localizable strings and a few other assets.
  • Loading branch information
@ocollet
ocollet committed Oct 9, 2019
1 parent ac3db24 commit bc35cc9
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 50 deletions.
7 changes: 0 additions & 7 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

72 changes: 57 additions & 15 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,52 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
09329CF9234D2D9E006BD592 /* UnsplashPhotoPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 09329CF8234D2D9E006BD592 /* UnsplashPhotoPicker */; };
231D128E218FC2E6002C5750 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 231D128D218FC2E6002C5750 /* AppDelegate.swift */; };
231D1290218FC2E6002C5750 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 231D128F218FC2E6002C5750 /* ViewController.swift */; };
231D1293218FC2E7002C5750 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 231D1291218FC2E7002C5750 /* Main.storyboard */; };
231D1295218FC2E9002C5750 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 231D1294218FC2E9002C5750 /* Assets.xcassets */; };
231D1298218FC2E9002C5750 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 231D1296218FC2E9002C5750 /* LaunchScreen.storyboard */; };
231D12A0218FC338002C5750 /* PhotoCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 231D129F218FC338002C5750 /* PhotoCollectionViewCell.swift */; };
231D12A7218FC387002C5750 /* UnsplashPhotoPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 231D12A6218FC37E002C5750 /* UnsplashPhotoPicker.framework */; };
231D12A8218FC387002C5750 /* UnsplashPhotoPicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 231D12A6218FC37E002C5750 /* UnsplashPhotoPicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
231D12A5218FC37E002C5750 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 231D12A1218FC37E002C5750 /* UnsplashPhotoPicker.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 23B683BB216BF83200CAA546;
remoteInfo = UnsplashPhotoPicker;
};
231D12A9218FC387002C5750 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 231D12A1218FC37E002C5750 /* UnsplashPhotoPicker.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 23B683BA216BF83200CAA546;
remoteInfo = UnsplashPhotoPicker;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
231D12AB218FC387002C5750 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
231D12A8218FC387002C5750 /* UnsplashPhotoPicker.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
09329CF6234D2D62006BD592 /* iOS Photo Picker */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "iOS Photo Picker"; path = ..; sourceTree = "<group>"; };
231D128A218FC2E6002C5750 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
231D128D218FC2E6002C5750 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
231D128F218FC2E6002C5750 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -39,14 +57,15 @@
231D1297218FC2E9002C5750 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
231D1299218FC2E9002C5750 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
231D129F218FC338002C5750 /* PhotoCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoCollectionViewCell.swift; sourceTree = "<group>"; };
231D12A1218FC37E002C5750 /* UnsplashPhotoPicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UnsplashPhotoPicker.xcodeproj; path = ../UnsplashPhotoPicker/UnsplashPhotoPicker.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
231D1287218FC2E6002C5750 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
09329CF9234D2D9E006BD592 /* UnsplashPhotoPicker in Frameworks */,
231D12A7218FC387002C5750 /* UnsplashPhotoPicker.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -58,7 +77,7 @@
children = (
231D128C218FC2E6002C5750 /* Example */,
231D128B218FC2E6002C5750 /* Products */,
09329CF6234D2D62006BD592 /* iOS Photo Picker */,
231D12A1218FC37E002C5750 /* UnsplashPhotoPicker.xcodeproj */,
);
sourceTree = "<group>";
};
Expand All @@ -84,6 +103,14 @@
path = Example;
sourceTree = "<group>";
};
231D12A2218FC37E002C5750 /* Products */ = {
isa = PBXGroup;
children = (
231D12A6218FC37E002C5750 /* UnsplashPhotoPicker.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -99,11 +126,9 @@
buildRules = (
);
dependencies = (
231D12AA218FC387002C5750 /* PBXTargetDependency */,
);
name = Example;
packageProductDependencies = (
09329CF8234D2D9E006BD592 /* UnsplashPhotoPicker */,
);
productName = Example;
productReference = 231D128A218FC2E6002C5750 /* Example.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -135,13 +160,29 @@
mainGroup = 231D1281218FC2E6002C5750;
productRefGroup = 231D128B218FC2E6002C5750 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 231D12A2218FC37E002C5750 /* Products */;
ProjectRef = 231D12A1218FC37E002C5750 /* UnsplashPhotoPicker.xcodeproj */;
},
);
projectRoot = "";
targets = (
231D1289218FC2E6002C5750 /* Example */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
231D12A6218FC37E002C5750 /* UnsplashPhotoPicker.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = UnsplashPhotoPicker.framework;
remoteRef = 231D12A5218FC37E002C5750 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
231D1288218FC2E6002C5750 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand All @@ -168,6 +209,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
231D12AA218FC387002C5750 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = UnsplashPhotoPicker;
targetProxy = 231D12A9218FC387002C5750 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
231D1291218FC2E7002C5750 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -366,13 +415,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
09329CF8234D2D9E006BD592 /* UnsplashPhotoPicker */ = {
isa = XCSwiftPackageProductDependency;
productName = UnsplashPhotoPicker;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 231D1282218FC2E6002C5750 /* Project object */;
}
19 changes: 0 additions & 19 deletions Package.swift
View file

This file was deleted.

10 changes: 2 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Unsplash Photo Picker for iOS

[![SPM Compatible](https://img.shields.io/badge/Swift%20Package%20Manager-Compatible-brightgreen)](https://swift.org/package-manager)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat-square)](https://github.com/Carthage/Carthage)
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/UnsplashPhotoPicker.svg?style=flat-square)](https://cocoapods.org/pods/UnsplashPhotoPicker)
[![Platform](https://img.shields.io/cocoapods/p/UnsplashPhotoPicker.svg?style=flat-square)](https://github.com/unsplash/unsplash-photopicker-ios)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat-square)](https://github.com/Carthage/Carthage)
[![Platform](https://img.shields.io/cocoapods/p/UnsplashPhotoPicker.svg?style=flat-square)](https://alamofire.github.io/Alamofire)
[![License](https://img.shields.io/github/license/unsplash/unsplash-photopicker-ios.svg?style=flat-square)](https://github.com/unsplash/unsplash-photopicker-ios)

UnsplashPhotoPicker is an iOS UI component that allows you to quickly search the Unsplash library for free high-quality photos with just a few lines of code.
Expand All @@ -17,7 +16,6 @@ Android photo picker [here](https://github.com/unsplash/unsplash-photopicker-and
- [Description](#description)
- [Requirements](#requirements)
- [Installation](#installation)
- [Swift Package Manager](#swift-package-manager)
- [Carthage](#carthage)
- [CocoaPods](#cocoapods)
- [Git submodule](#git-submodule)
Expand All @@ -42,10 +40,6 @@ UnsplashPhotoPicker is a view controller. You present it to offer your users to

## Installation

### Swift Package Manager

To integrate UnsplashPhotoPicker into your Xcode project using [Swift Package Manager](https://swift.org/package-manager/), follow the instructions [here](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app).

### Carthage

To integrate UnsplashPhotoPicker into your Xcode project using [Carthage](https://github.com/Carthage/Carthage), specify it in your `Cartfile`:
Expand Down
2 changes: 1 addition & 1 deletion ...lashPhotoPicker/UnsplashPhotoPicker/Classes/Utils/KeyedDecodingContainer+Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2017 Unsplash. All rights reserved.
//

import UIKit
import Foundation

extension KeyedDecodingContainer {
func decode(_ type: UIColor.Type, forKey key: Key) throws -> UIColor {
Expand Down

0 comments on commit bc35cc9

Please sign in to comment.