diff --git a/.bundle/config b/.bundle/config deleted file mode 100644 index 2369228..0000000 --- a/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ ---- -BUNDLE_PATH: "vendor/bundle" diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/DownPicker.playground/Contents.swift b/DownPicker.playground/Contents.swift deleted file mode 100644 index 7a6a706..0000000 --- a/DownPicker.playground/Contents.swift +++ /dev/null @@ -1,5 +0,0 @@ -//: Playground - noun: a place where people can play - -import DownPicker - -var str = "Hello, playground" diff --git a/DownPicker.playground/contents.xcplayground b/DownPicker.playground/contents.xcplayground deleted file mode 100644 index fc5b4ab..0000000 --- a/DownPicker.playground/contents.xcplayground +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/DownPicker.xcodeproj/xcshareddata/xcschemes/DownPicker-iOS.xcscheme b/DownPicker.xcodeproj/xcshareddata/xcschemes/DownPicker-iOS.xcscheme deleted file mode 100644 index 018d7bb..0000000 --- a/DownPicker.xcodeproj/xcshareddata/xcschemes/DownPicker-iOS.xcscheme +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DownPickerSwift.podspec b/DownPickerSwift.podspec index 5d45b41..6ba8a66 100644 --- a/DownPickerSwift.podspec +++ b/DownPickerSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DownPickerSwift' - s.version = '1.1.2' + s.version = '2.0.0' s.license = { :type => "MIT", :file => "LICENSE" } s.summary = 'DownPickerSwift is an extremely light-weight class library for creating DropDownList / ComboBox controls for iOS.' s.homepage = 'https://github.com/HomebaseAI/DownPickerSwift' diff --git a/DownPicker.xcodeproj/project.pbxproj b/DownPickerSwift.xcodeproj/project.pbxproj similarity index 89% rename from DownPicker.xcodeproj/project.pbxproj rename to DownPickerSwift.xcodeproj/project.pbxproj index 97a12d7..8719ea8 100644 --- a/DownPicker.xcodeproj/project.pbxproj +++ b/DownPickerSwift.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 3549BB501DA38A2000C63030 /* DownPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3549BB181DA3890B00C63030 /* DownPicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3549BB661DA38ADB00C63030 /* DownPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3549BB211DA389CD00C63030 /* DownPicker.framework */; }; + 3549BB661DA38ADB00C63030 /* DownPickerSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3549BB211DA389CD00C63030 /* DownPickerSwift.framework */; }; 359649031FB18CC000FC7ADC /* DownPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 359649021FB18CBF00FC7ADC /* DownPicker.swift */; }; BD35B4F221DE6F45009F360C /* UIDownPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD35B4F121DE6F45009F360C /* UIDownPicker.swift */; }; /* End PBXBuildFile section */ @@ -39,9 +39,9 @@ /* Begin PBXFileReference section */ 3549BB171DA3890B00C63030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3549BB181DA3890B00C63030 /* DownPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownPicker.h; sourceTree = ""; }; - 3549BB211DA389CD00C63030 /* DownPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DownPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3549BB211DA389CD00C63030 /* DownPickerSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DownPickerSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3549BB581DA38A8800C63030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3549BB611DA38ADB00C63030 /* DownPickerTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "DownPickerTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3549BB611DA38ADB00C63030 /* DownPickerSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DownPickerSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 359649021FB18CBF00FC7ADC /* DownPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownPicker.swift; sourceTree = ""; }; BD35B4F121DE6F45009F360C /* UIDownPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDownPicker.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -58,7 +58,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3549BB661DA38ADB00C63030 /* DownPicker.framework in Frameworks */, + 3549BB661DA38ADB00C63030 /* DownPickerSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -78,8 +78,8 @@ 3549BB061DA387DB00C63030 /* Products */ = { isa = PBXGroup; children = ( - 3549BB211DA389CD00C63030 /* DownPicker.framework */, - 3549BB611DA38ADB00C63030 /* DownPickerTests-iOS.xctest */, + 3549BB211DA389CD00C63030 /* DownPickerSwift.framework */, + 3549BB611DA38ADB00C63030 /* DownPickerSwiftTests.xctest */, ); name = Products; sourceTree = ""; @@ -148,9 +148,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 3549BB201DA389CD00C63030 /* DownPicker-iOS */ = { + 3549BB201DA389CD00C63030 /* DownPickerSwift */ = { isa = PBXNativeTarget; - buildConfigurationList = 3549BB261DA389CD00C63030 /* Build configuration list for PBXNativeTarget "DownPicker-iOS" */; + buildConfigurationList = 3549BB261DA389CD00C63030 /* Build configuration list for PBXNativeTarget "DownPickerSwift" */; buildPhases = ( 3549BB1C1DA389CD00C63030 /* Sources */, 3549BB1D1DA389CD00C63030 /* Frameworks */, @@ -161,14 +161,14 @@ ); dependencies = ( ); - name = "DownPicker-iOS"; + name = DownPickerSwift; productName = "DownPicker-iOS"; - productReference = 3549BB211DA389CD00C63030 /* DownPicker.framework */; + productReference = 3549BB211DA389CD00C63030 /* DownPickerSwift.framework */; productType = "com.apple.product-type.framework"; }; - 3549BB601DA38ADB00C63030 /* DownPickerTests-iOS */ = { + 3549BB601DA38ADB00C63030 /* DownPickerSwiftTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 3549BB691DA38ADB00C63030 /* Build configuration list for PBXNativeTarget "DownPickerTests-iOS" */; + buildConfigurationList = 3549BB691DA38ADB00C63030 /* Build configuration list for PBXNativeTarget "DownPickerSwiftTests" */; buildPhases = ( 3549BB5D1DA38ADB00C63030 /* Sources */, 3549BB5E1DA38ADB00C63030 /* Frameworks */, @@ -180,9 +180,9 @@ dependencies = ( 3549BB681DA38ADB00C63030 /* PBXTargetDependency */, ); - name = "DownPickerTests-iOS"; + name = DownPickerSwiftTests; productName = "DownPickerTests-iOS"; - productReference = 3549BB611DA38ADB00C63030 /* DownPickerTests-iOS.xctest */; + productReference = 3549BB611DA38ADB00C63030 /* DownPickerSwiftTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -207,7 +207,7 @@ }; }; }; - buildConfigurationList = 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "DownPicker" */; + buildConfigurationList = 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "DownPickerSwift" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -220,8 +220,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 3549BB201DA389CD00C63030 /* DownPicker-iOS */, - 3549BB601DA38ADB00C63030 /* DownPickerTests-iOS */, + 3549BB201DA389CD00C63030 /* DownPickerSwift */, + 3549BB601DA38ADB00C63030 /* DownPickerSwiftTests */, ); }; /* End PBXProject section */ @@ -265,7 +265,7 @@ /* Begin PBXTargetDependency section */ 3549BB681DA38ADB00C63030 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3549BB201DA389CD00C63030 /* DownPicker-iOS */; + target = 3549BB201DA389CD00C63030 /* DownPickerSwift */; targetProxy = 3549BB671DA38ADB00C63030 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -405,12 +405,14 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = ai.homebase.DownPickerSwift; - PRODUCT_NAME = DownPicker; + PRODUCT_NAME = DownPickerSwift; SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -427,11 +429,13 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = ai.homebase.DownPickerSwift; - PRODUCT_NAME = DownPicker; + PRODUCT_NAME = DownPickerSwift; SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -473,7 +477,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "DownPicker" */ = { + 3549BAFF1DA387DB00C63030 /* Build configuration list for PBXProject "DownPickerSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( 3549BB0B1DA387DB00C63030 /* Debug */, @@ -482,7 +486,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3549BB261DA389CD00C63030 /* Build configuration list for PBXNativeTarget "DownPicker-iOS" */ = { + 3549BB261DA389CD00C63030 /* Build configuration list for PBXNativeTarget "DownPickerSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( 3549BB271DA389CD00C63030 /* Debug */, @@ -491,7 +495,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3549BB691DA38ADB00C63030 /* Build configuration list for PBXNativeTarget "DownPickerTests-iOS" */ = { + 3549BB691DA38ADB00C63030 /* Build configuration list for PBXNativeTarget "DownPickerSwiftTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 3549BB6A1DA38ADB00C63030 /* Debug */, diff --git a/DownPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DownPickerSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from DownPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to DownPickerSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/DownPicker.xcworkspace/contents.xcworkspacedata b/DownPickerSwift.xcworkspace/contents.xcworkspacedata similarity index 72% rename from DownPicker.xcworkspace/contents.xcworkspacedata rename to DownPickerSwift.xcworkspace/contents.xcworkspacedata index 39a1114..b79adfd 100644 --- a/DownPicker.xcworkspace/contents.xcworkspacedata +++ b/DownPickerSwift.xcworkspace/contents.xcworkspacedata @@ -2,13 +2,7 @@ - - - - + location = "group:/Users/danielchick/Desktop/Homebase/DownPickerSwift/DownPickerSwift.xcodeproj"> @@ -32,6 +26,6 @@ location = "group:Gemfile.lock"> + location = "group:/Users/danielchick/Desktop/Homebase/DownPickerSwift/DownPickerSwift.podspec"> diff --git a/DownPicker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DownPickerSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from DownPicker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to DownPickerSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Gemfile b/Gemfile index 7f503c2..a777e35 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'cocoapods', "~> 1.6.0.beta.2" +gem 'cocoapods' gem 'jazzy' gem 'danger' diff --git a/Sources/Info.plist b/Sources/Info.plist index 20b05ec..ec0cc7b 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/scripts/bootstrap b/scripts/bootstrap deleted file mode 100644 index e5b0bda..0000000 --- a/scripts/bootstrap +++ /dev/null @@ -1 +0,0 @@ -carthage bootstrap --no-use-binaries --cache-builds