Skip to content

Commit 344cfc5

Browse files
committed
# Conflicts: # TextFieldEffects/TextFieldEffects.xcodeproj/project.pbxproj # TextFieldEffects/TextFieldEffects.xcodeproj/xcshareddata/xcschemes/TextFieldEffects.xcscheme
2 parents 56d37b3 + 018ae13 commit 344cfc5

File tree

5 files changed

+27
-24
lines changed

5 files changed

+27
-24
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## Version 1.6.0
4+
* Support for Swift 5 and Xcode 11
5+
36
## Version 1.5.1
47
* Syntax improvements
58
* Removed old Swift 4.2 migration code

TextFieldEffects.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "TextFieldEffects"
19-
s.version = "1.5.1"
19+
s.version = "1.6.0"
2020
s.summary = "Custom drop in UITextFields effects."
2121

2222
s.description = <<-DESC
@@ -57,7 +57,7 @@ Pod::Spec.new do |s|
5757
#
5858

5959
s.platform = :ios, '8.0'
60-
s.swift_version = '4.2'
60+
s.swift_version = '5.0'
6161

6262
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
6363
#

TextFieldEffects/TextFieldEffects.xcodeproj/project.pbxproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,18 +218,18 @@
218218
isa = PBXProject;
219219
attributes = {
220220
LastSwiftUpdateCheck = 0700;
221-
LastUpgradeCheck = 1020;
221+
LastUpgradeCheck = 1100;
222222
ORGANIZATIONNAME = "Raul Riera";
223223
TargetAttributes = {
224224
4CB3B6CD1AA8DEA7000AFA56 = {
225225
CreatedOnToolsVersion = 6.2;
226-
LastSwiftMigration = 1000;
226+
LastSwiftMigration = 1100;
227227
ProvisioningStyle = Automatic;
228228
};
229229
4CBF766C1A71AF7700073B6A = {
230230
CreatedOnToolsVersion = 6.1.1;
231231
DevelopmentTeam = R64MTWS872;
232-
LastSwiftMigration = 1000;
232+
LastSwiftMigration = 1100;
233233
};
234234
};
235235
};
@@ -334,7 +334,7 @@
334334
isa = XCBuildConfiguration;
335335
buildSettings = {
336336
CLANG_ENABLE_MODULES = YES;
337-
CODE_SIGN_IDENTITY = "iPhone Developer";
337+
CODE_SIGN_IDENTITY = "";
338338
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
339339
CODE_SIGN_STYLE = Automatic;
340340
DEFINES_MODULE = YES;
@@ -354,14 +354,15 @@
354354
PROVISIONING_PROFILE_SPECIFIER = "";
355355
SKIP_INSTALL = YES;
356356
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
357+
SWIFT_VERSION = 5.0;
357358
};
358359
name = Debug;
359360
};
360361
4CB3B6E31AA8DEA7000AFA56 /* Release */ = {
361362
isa = XCBuildConfiguration;
362363
buildSettings = {
363364
CLANG_ENABLE_MODULES = YES;
364-
CODE_SIGN_IDENTITY = "iPhone Developer";
365+
CODE_SIGN_IDENTITY = "";
365366
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
366367
CODE_SIGN_STYLE = Automatic;
367368
COPY_PHASE_STRIP = NO;
@@ -378,6 +379,7 @@
378379
PROVISIONING_PROFILE_SPECIFIER = "";
379380
SKIP_INSTALL = YES;
380381
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
382+
SWIFT_VERSION = 5.0;
381383
};
382384
name = Release;
383385
};
@@ -434,7 +436,7 @@
434436
ONLY_ACTIVE_ARCH = YES;
435437
SDKROOT = iphoneos;
436438
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
437-
SWIFT_VERSION = 5.0;
439+
SWIFT_VERSION = 4.2;
438440
TARGETED_DEVICE_FAMILY = "1,2";
439441
VERSIONING_SYSTEM = "apple-generic";
440442
VERSION_INFO_PREFIX = "";
@@ -485,7 +487,7 @@
485487
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
486488
MTL_ENABLE_DEBUG_INFO = NO;
487489
SDKROOT = iphoneos;
488-
SWIFT_VERSION = 5.0;
490+
SWIFT_VERSION = 4.2;
489491
TARGETED_DEVICE_FAMILY = "1,2";
490492
VALIDATE_PRODUCT = YES;
491493
VERSIONING_SYSTEM = "apple-generic";
@@ -507,6 +509,7 @@
507509
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
508510
PRODUCT_BUNDLE_IDENTIFIER = "com.raulriera.$(PRODUCT_NAME:rfc1034identifier)";
509511
PRODUCT_NAME = "$(TARGET_NAME)";
512+
SWIFT_VERSION = 5.0;
510513
};
511514
name = Debug;
512515
};
@@ -521,6 +524,7 @@
521524
PRODUCT_BUNDLE_IDENTIFIER = "com.raulriera.$(PRODUCT_NAME:rfc1034identifier)";
522525
PRODUCT_NAME = "$(TARGET_NAME)";
523526
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
527+
SWIFT_VERSION = 5.0;
524528
};
525529
name = Release;
526530
};

TextFieldEffects/TextFieldEffects.xcodeproj/xcshareddata/xcschemes/TextFieldEffects.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "4CB3B6CD1AA8DEA7000AFA56"
48+
BuildableName = "TextFieldEffects.framework"
49+
BlueprintName = "TextFieldEffects"
50+
ReferencedContainer = "container:TextFieldEffects.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "4CB3B6CD1AA8DEA7000AFA56"
60-
BuildableName = "TextFieldEffects.framework"
61-
BlueprintName = "TextFieldEffects"
62-
ReferencedContainer = "container:TextFieldEffects.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:TextFieldEffects.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

0 commit comments

Comments
 (0)