From 556992b41851f0ca537622aaccca4d0ae97d234b Mon Sep 17 00:00:00 2001 From: Piotr Bernad Date: Mon, 8 Jul 2019 09:42:48 +0200 Subject: [PATCH] Working on Carthage support --- PlacePicker-iOS/PlacePicker_iOS.h | 8 +- .../PlacePicker_iOSTests.swift | 2 +- PlacesPicker.xcodeproj/project.pbxproj | 22 ++-- .../xcschemes/PlacesPicker-iOS.xcscheme | 80 +++++++++++++ .../xcschemes/PlacesPicker.xcscheme | 111 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 25 +++- .../Classes/DefaultPlacesListRenderer.swift | 2 +- PlacesPicker/ViewController.swift | 2 +- 8 files changed, 233 insertions(+), 19 deletions(-) create mode 100644 PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker-iOS.xcscheme create mode 100644 PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker.xcscheme diff --git a/PlacePicker-iOS/PlacePicker_iOS.h b/PlacePicker-iOS/PlacePicker_iOS.h index 2ab9cea..d7ceab5 100644 --- a/PlacePicker-iOS/PlacePicker_iOS.h +++ b/PlacePicker-iOS/PlacePicker_iOS.h @@ -8,12 +8,12 @@ #import -//! Project version number for PlacePicker_iOS. -FOUNDATION_EXPORT double PlacePicker_iOSVersionNumber; +//! Project version number for PlacePicker. +FOUNDATION_EXPORT double PlacePickerVersionNumber; //! Project version string for PlacePicker_iOS. -FOUNDATION_EXPORT const unsigned char PlacePicker_iOSVersionString[]; +FOUNDATION_EXPORT const unsigned char PlacePickerVersionString[]; -// In this header, you should import all the public headers of your framework using statements like #import +// In this header, you should import all the public headers of your framework using statements like #import diff --git a/PlacePicker-iOSTests/PlacePicker_iOSTests.swift b/PlacePicker-iOSTests/PlacePicker_iOSTests.swift index 24af39a..24e4bbd 100644 --- a/PlacePicker-iOSTests/PlacePicker_iOSTests.swift +++ b/PlacePicker-iOSTests/PlacePicker_iOSTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import PlacePicker_iOS +@testable import PlacePicker class PlacePicker_iOSTests: XCTestCase { diff --git a/PlacesPicker.xcodeproj/project.pbxproj b/PlacesPicker.xcodeproj/project.pbxproj index d3f4fd5..a564d9b 100644 --- a/PlacesPicker.xcodeproj/project.pbxproj +++ b/PlacesPicker.xcodeproj/project.pbxproj @@ -17,11 +17,11 @@ 2465877A22CE6C4300F17A44 /* GoogleMapsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465877522CE6C4200F17A44 /* GoogleMapsCore.framework */; }; 2465877B22CE6C4300F17A44 /* GooglePlaces.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465877622CE6C4200F17A44 /* GooglePlaces.framework */; }; 2465877D22CE6C4300F17A44 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465877822CE6C4200F17A44 /* GoogleMapsBase.framework */; }; - 2465878D22CE6DEF00F17A44 /* PlacePicker_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */; }; + 2465878D22CE6DEF00F17A44 /* PlacePicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker.framework */; }; 2465879422CE6DEF00F17A44 /* PlacePicker_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2465879322CE6DEF00F17A44 /* PlacePicker_iOSTests.swift */; }; 2465879622CE6DEF00F17A44 /* PlacePicker_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2465878622CE6DEF00F17A44 /* PlacePicker_iOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2465879922CE6DEF00F17A44 /* PlacePicker_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */; }; - 2465879A22CE6DEF00F17A44 /* PlacePicker_iOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 2465879922CE6DEF00F17A44 /* PlacePicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker.framework */; }; + 2465879A22CE6DEF00F17A44 /* PlacePicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2465878422CE6DEF00F17A44 /* PlacePicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 246587A322CE6E1100F17A44 /* PlacePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246587A222CE6E1100F17A44 /* PlacePicker.swift */; }; 246587A422CF28D900F17A44 /* GoogleMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465877422CE6C4200F17A44 /* GoogleMaps.framework */; }; 246587A522CF28D900F17A44 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2465877822CE6C4200F17A44 /* GoogleMapsBase.framework */; }; @@ -80,7 +80,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 2465879A22CE6DEF00F17A44 /* PlacePicker_iOS.framework in Embed Frameworks */, + 2465879A22CE6DEF00F17A44 /* PlacePicker.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -102,7 +102,7 @@ 2465877522CE6C4200F17A44 /* GoogleMapsCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMapsCore.framework; path = Carthage/Build/iOS/GoogleMapsCore.framework; sourceTree = SOURCE_ROOT; }; 2465877622CE6C4200F17A44 /* GooglePlaces.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GooglePlaces.framework; path = Carthage/Build/iOS/GooglePlaces.framework; sourceTree = SOURCE_ROOT; }; 2465877822CE6C4200F17A44 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMapsBase.framework; path = Carthage/Build/iOS/GoogleMapsBase.framework; sourceTree = SOURCE_ROOT; }; - 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PlacePicker_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2465878422CE6DEF00F17A44 /* PlacePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PlacePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2465878622CE6DEF00F17A44 /* PlacePicker_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlacePicker_iOS.h; sourceTree = ""; }; 2465878722CE6DEF00F17A44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2465878C22CE6DEF00F17A44 /* PlacePicker-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PlacePicker-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -132,7 +132,7 @@ 2465877D22CE6C4300F17A44 /* GoogleMapsBase.framework in Frameworks */, 2465877B22CE6C4300F17A44 /* GooglePlaces.framework in Frameworks */, 2465877922CE6C4200F17A44 /* GoogleMaps.framework in Frameworks */, - 2465879922CE6DEF00F17A44 /* PlacePicker_iOS.framework in Frameworks */, + 2465879922CE6DEF00F17A44 /* PlacePicker.framework in Frameworks */, 2465877A22CE6C4300F17A44 /* GoogleMapsCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -159,7 +159,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2465878D22CE6DEF00F17A44 /* PlacePicker_iOS.framework in Frameworks */, + 2465878D22CE6DEF00F17A44 /* PlacePicker.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,7 +183,7 @@ children = ( 242FBBFE22CCC01C001C6789 /* PlacesPicker.app */, 242FBC1222CCC01E001C6789 /* PlacesPickerTests.xctest */, - 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */, + 2465878422CE6DEF00F17A44 /* PlacePicker.framework */, 2465878C22CE6DEF00F17A44 /* PlacePicker-iOSTests.xctest */, ); name = Products; @@ -329,7 +329,7 @@ ); name = "PlacePicker-iOS"; productName = "PlacePicker-iOS"; - productReference = 2465878422CE6DEF00F17A44 /* PlacePicker_iOS.framework */; + productReference = 2465878422CE6DEF00F17A44 /* PlacePicker.framework */; productType = "com.apple.product-type.framework"; }; 2465878B22CE6DEF00F17A44 /* PlacePicker-iOSTests */ = { @@ -782,7 +782,7 @@ "@loader_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "com.piotrbernad.placepicker.PlacePicker-iOS"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = PlacePicker; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -816,7 +816,7 @@ "@loader_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "com.piotrbernad.placepicker.PlacePicker-iOS"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = PlacePicker; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker-iOS.xcscheme b/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker-iOS.xcscheme new file mode 100644 index 0000000..31ee996 --- /dev/null +++ b/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker-iOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker.xcscheme b/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker.xcscheme new file mode 100644 index 0000000..03e1e15 --- /dev/null +++ b/PlacesPicker.xcodeproj/xcshareddata/xcschemes/PlacesPicker.xcscheme @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PlacesPicker.xcodeproj/xcuserdata/piotrbernad.xcuserdatad/xcschemes/xcschememanagement.plist b/PlacesPicker.xcodeproj/xcuserdata/piotrbernad.xcuserdatad/xcschemes/xcschememanagement.plist index 079e826..9bfb855 100644 --- a/PlacesPicker.xcodeproj/xcuserdata/piotrbernad.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/PlacesPicker.xcodeproj/xcuserdata/piotrbernad.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,7 +4,7 @@ SchemeUserState - PlacePicker-iOS.xcscheme_^#shared#^_ + PlacesPicker-iOS.xcscheme_^#shared#^_ orderHint 1 @@ -15,5 +15,28 @@ 0 + SuppressBuildableAutocreation + + 242FBBFD22CCC01C001C6789 + + primary + + + 242FBC1122CCC01E001C6789 + + primary + + + 2465878322CE6DEF00F17A44 + + primary + + + 2465878B22CE6DEF00F17A44 + + primary + + + diff --git a/PlacesPicker/Classes/DefaultPlacesListRenderer.swift b/PlacesPicker/Classes/DefaultPlacesListRenderer.swift index e8ec734..8c7b0fa 100644 --- a/PlacesPicker/Classes/DefaultPlacesListRenderer.swift +++ b/PlacesPicker/Classes/DefaultPlacesListRenderer.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Piotr Bernad. All rights reserved. // -import Foundation +import UIKit public class DefaultPlacesListRenderer: PlacesListRenderer { public init() {} diff --git a/PlacesPicker/ViewController.swift b/PlacesPicker/ViewController.swift index ac66f48..790152c 100644 --- a/PlacesPicker/ViewController.swift +++ b/PlacesPicker/ViewController.swift @@ -7,7 +7,7 @@ // import UIKit -import PlacePicker_iOS +import PlacePicker import GooglePlaces class ViewController: UIViewController {