Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swift5 #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Swift5 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58cb30c
refs #26 - update project to swift5
SergeyPetrachkov Mar 26, 2019
cb865cb
refs #26 - update podspec
SergeyPetrachkov Mar 26, 2019
ef8c0b4
Merge pull request #1 from tingxins/master
SergeyPetrachkov Mar 26, 2019
1a404eb
Merge branch 'master' into swift5
SergeyPetrachkov Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions InputKitDemo/InputKitDemo_OC/InputKitDemo_OC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
9754B90A1EE1710100A7CCA8 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = tingxins;
TargetAttributes = {
9754B9111EE1710100A7CCA8 = {
Expand All @@ -272,7 +272,7 @@
};
buildConfigurationList = 9754B90D1EE1710100A7CCA8 /* Build configuration list for PBXProject "InputKitDemo_OC" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -390,6 +390,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -447,6 +448,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down
23 changes: 10 additions & 13 deletions InputKitDemo/InputKitDemo_Swift/InputKitDemo_Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,27 +221,28 @@
97F5EDBC1EE63D820083F0FB = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = QZ2B7EZFJP;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
97F5EDD01EE63D830083F0FB = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = QZ2B7EZFJP;
LastSwiftMigration = 0930;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = 97F5EDBC1EE63D820083F0FB;
};
97F5EDDB1EE63D830083F0FB = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = QZ2B7EZFJP;
LastSwiftMigration = 0930;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = 97F5EDBC1EE63D820083F0FB;
};
};
};
buildConfigurationList = 97F5EDB81EE63D820083F0FB /* Build configuration list for PBXProject "InputKitDemo_Swift" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -474,7 +475,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -488,7 +489,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -502,8 +503,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-SwiftTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InputKitDemo_Swift.app/InputKitDemo_Swift";
};
name = Debug;
Expand All @@ -518,8 +518,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-SwiftTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/InputKitDemo_Swift.app/InputKitDemo_Swift";
};
name = Release;
Expand All @@ -533,8 +532,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-SwiftUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = InputKitDemo_Swift;
};
name = Debug;
Expand All @@ -548,8 +546,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tingxins.demo.InputKitDemo-SwiftUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = InputKitDemo_Swift;
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions InputKitSwift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "InputKitSwift"
s.version = "1.2.1"
s.version = "1.2.2"
s.summary = "InputKit is an Elegant Kit to limits your input text in Swift, inspired by BlocksKit."
s.homepage = "https://github.com/tingxins/InputKit"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "tingxins" => "tingxins@sina.com" }
s.platform = :ios, "8.0"
s.source = { :git => "https://github.com/tingxins/InputKit.git", :tag => 'v1.2.1' }
s.source = { :git => "https://github.com/tingxins/InputKit.git", :tag => s.version.to_s }
s.source_files = 'InputKitSwift/**/*.{swift}'
s.requires_arc = true
end