Skip to content

Commit 56508ee

Browse files
committed
Merge branch 'release/3.0.2'
2 parents a7b84a3 + 30b6b03 commit 56508ee

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

SwiftRichString.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
1212
s.ios.deployment_target = "8.0"
1313
s.osx.deployment_target = "10.10"
1414
s.watchos.deployment_target = "2.0"
15-
s.tvos.deployment_target = "9.0"
15+
s.tvos.deployment_target = "9.2"
1616
s.source = { :git => "https://github.com/malcommac/SwiftRichString.git", :tag => s.version.to_s }
1717
s.source_files = "Sources/**/*"
1818
s.frameworks = "Foundation"

SwiftRichString.xcodeproj/project.pbxproj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -891,15 +891,15 @@
891891
};
892892
52D6D9E11BEFFF6E002C0205 = {
893893
CreatedOnToolsVersion = 7.1;
894-
LastSwiftMigration = 0930;
894+
LastSwiftMigration = 1100;
895895
};
896896
52D6D9EF1BEFFFBE002C0205 = {
897897
CreatedOnToolsVersion = 7.1;
898898
LastSwiftMigration = 0930;
899899
};
900900
52D6DA0E1BF000BD002C0205 = {
901901
CreatedOnToolsVersion = 7.1;
902-
LastSwiftMigration = 0930;
902+
LastSwiftMigration = 1100;
903903
};
904904
64507EDA20B18F0F009455BD = {
905905
CreatedOnToolsVersion = 9.3.1;
@@ -932,7 +932,7 @@
932932
};
933933
DD7502791C68FCFC006590AF = {
934934
CreatedOnToolsVersion = 7.2.1;
935-
LastSwiftMigration = 0800;
935+
LastSwiftMigration = 1100;
936936
};
937937
DD75028C1C690C7A006590AF = {
938938
CreatedOnToolsVersion = 7.2.1;
@@ -1601,6 +1601,7 @@
16011601
SDKROOT = watchos;
16021602
SKIP_INSTALL = YES;
16031603
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1604+
SWIFT_VERSION = 5.0;
16041605
TARGETED_DEVICE_FAMILY = 4;
16051606
WATCHOS_DEPLOYMENT_TARGET = 2.0;
16061607
};
@@ -1624,6 +1625,7 @@
16241625
SDKROOT = watchos;
16251626
SKIP_INSTALL = YES;
16261627
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1628+
SWIFT_VERSION = 5.0;
16271629
TARGETED_DEVICE_FAMILY = 4;
16281630
WATCHOS_DEPLOYMENT_TARGET = 2.0;
16291631
};
@@ -1696,6 +1698,7 @@
16961698
SDKROOT = macosx;
16971699
SKIP_INSTALL = YES;
16981700
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1701+
SWIFT_VERSION = 5.0;
16991702
};
17001703
name = Debug;
17011704
};
@@ -1720,13 +1723,14 @@
17201723
SDKROOT = macosx;
17211724
SKIP_INSTALL = YES;
17221725
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1726+
SWIFT_VERSION = 5.0;
17231727
};
17241728
name = Release;
17251729
};
17261730
64507EE820B18F11009455BD /* Debug */ = {
17271731
isa = XCBuildConfiguration;
17281732
buildSettings = {
1729-
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
1733+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
17301734
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
17311735
CLANG_ANALYZER_NONNULL = YES;
17321736
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1752,7 +1756,7 @@
17521756
64507EE920B18F11009455BD /* Release */ = {
17531757
isa = XCBuildConfiguration;
17541758
buildSettings = {
1755-
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
1759+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
17561760
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
17571761
CLANG_ANALYZER_NONNULL = YES;
17581762
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1960,7 +1964,7 @@
19601964
GCC_C_LANGUAGE_STANDARD = gnu11;
19611965
INFOPLIST_FILE = ExampleMac/Info.plist;
19621966
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1963-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1967+
MACOSX_DEPLOYMENT_TARGET = 10.9;
19641968
PRODUCT_BUNDLE_IDENTIFIER = com.swiftrichstring.ExampleMac;
19651969
PRODUCT_NAME = "$(TARGET_NAME)";
19661970
SDKROOT = macosx;
@@ -1990,7 +1994,7 @@
19901994
GCC_C_LANGUAGE_STANDARD = gnu11;
19911995
INFOPLIST_FILE = ExampleMac/Info.plist;
19921996
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1993-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1997+
MACOSX_DEPLOYMENT_TARGET = 10.9;
19941998
PRODUCT_BUNDLE_IDENTIFIER = com.swiftrichstring.ExampleMac;
19951999
PRODUCT_NAME = "$(TARGET_NAME)";
19962000
SDKROOT = macosx;
@@ -2011,6 +2015,7 @@
20112015
PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS-Tests";
20122016
PRODUCT_NAME = "$(TARGET_NAME)";
20132017
SDKROOT = macosx;
2018+
SWIFT_VERSION = 5.0;
20142019
};
20152020
name = Debug;
20162021
};
@@ -2027,6 +2032,7 @@
20272032
PRODUCT_NAME = "$(TARGET_NAME)";
20282033
SDKROOT = macosx;
20292034
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
2035+
SWIFT_VERSION = 5.0;
20302036
};
20312037
name = Release;
20322038
};

0 commit comments

Comments
 (0)