Skip to content

Commit 5285da1

Browse files
raspuraspu
authored
Merge pull request #73 from RobertoMachorro/master
Updated to Xcode 12 / Swift 5
2 parents 87465e7 + 0301859 commit 5285da1

File tree

4 files changed

+52
-34
lines changed

4 files changed

+52
-34
lines changed

‎Highlightr.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -504,26 +504,28 @@
504504
8C2FB1B91F39118F00469D0D /* Project object */ = {
505505
isa = PBXProject;
506506
attributes = {
507-
LastUpgradeCheck = 0830;
507+
LastUpgradeCheck = 1200;
508508
ORGANIZATIONNAME = "Illanes, Juan Pablo";
509509
TargetAttributes = {
510510
8C2FB1C11F39118F00469D0D = {
511511
CreatedOnToolsVersion = 8.3.3;
512-
LastSwiftMigration = 0830;
513-
ProvisioningStyle = Automatic;
512+
LastSwiftMigration = 1030;
513+
ProvisioningStyle = Manual;
514514
};
515515
8CD1AE151F391713000FDA02 = {
516516
CreatedOnToolsVersion = 8.3.3;
517-
ProvisioningStyle = Automatic;
517+
LastSwiftMigration = 1030;
518+
ProvisioningStyle = Manual;
518519
};
519520
};
520521
};
521522
buildConfigurationList = 8C2FB1BC1F39118F00469D0D /* Build configuration list for PBXProject "Highlightr" */;
522523
compatibilityVersion = "Xcode 3.2";
523-
developmentRegion = English;
524+
developmentRegion = en;
524525
hasScannedForEncodings = 0;
525526
knownRegions = (
526527
en,
528+
Base,
527529
);
528530
mainGroup = 8C2FB1B81F39118F00469D0D;
529531
productRefGroup = 8C2FB1C31F39118F00469D0D /* Products */;
@@ -745,21 +747,31 @@
745747
isa = XCBuildConfiguration;
746748
buildSettings = {
747749
ALWAYS_SEARCH_USER_PATHS = NO;
750+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
748751
CLANG_ANALYZER_NONNULL = YES;
749752
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
750753
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
751754
CLANG_CXX_LIBRARY = "libc++";
752755
CLANG_ENABLE_MODULES = YES;
753756
CLANG_ENABLE_OBJC_ARC = YES;
757+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
754758
CLANG_WARN_BOOL_CONVERSION = YES;
759+
CLANG_WARN_COMMA = YES;
755760
CLANG_WARN_CONSTANT_CONVERSION = YES;
761+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
756762
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
757763
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
758764
CLANG_WARN_EMPTY_BODY = YES;
759765
CLANG_WARN_ENUM_CONVERSION = YES;
760766
CLANG_WARN_INFINITE_RECURSION = YES;
761767
CLANG_WARN_INT_CONVERSION = YES;
768+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
769+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
770+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
762771
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
772+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
773+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
774+
CLANG_WARN_STRICT_PROTOTYPES = YES;
763775
CLANG_WARN_SUSPICIOUS_MOVE = YES;
764776
CLANG_WARN_UNREACHABLE_CODE = YES;
765777
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -783,7 +795,7 @@
783795
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
784796
GCC_WARN_UNUSED_FUNCTION = YES;
785797
GCC_WARN_UNUSED_VARIABLE = YES;
786-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
798+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
787799
MTL_ENABLE_DEBUG_INFO = YES;
788800
ONLY_ACTIVE_ARCH = YES;
789801
SDKROOT = iphoneos;
@@ -799,21 +811,31 @@
799811
isa = XCBuildConfiguration;
800812
buildSettings = {
801813
ALWAYS_SEARCH_USER_PATHS = NO;
814+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
802815
CLANG_ANALYZER_NONNULL = YES;
803816
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
804817
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
805818
CLANG_CXX_LIBRARY = "libc++";
806819
CLANG_ENABLE_MODULES = YES;
807820
CLANG_ENABLE_OBJC_ARC = YES;
821+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
808822
CLANG_WARN_BOOL_CONVERSION = YES;
823+
CLANG_WARN_COMMA = YES;
809824
CLANG_WARN_CONSTANT_CONVERSION = YES;
825+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
810826
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
811827
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
812828
CLANG_WARN_EMPTY_BODY = YES;
813829
CLANG_WARN_ENUM_CONVERSION = YES;
814830
CLANG_WARN_INFINITE_RECURSION = YES;
815831
CLANG_WARN_INT_CONVERSION = YES;
832+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
833+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
834+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
816835
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
836+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
837+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
838+
CLANG_WARN_STRICT_PROTOTYPES = YES;
817839
CLANG_WARN_SUSPICIOUS_MOVE = YES;
818840
CLANG_WARN_UNREACHABLE_CODE = YES;
819841
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -831,7 +853,7 @@
831853
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
832854
GCC_WARN_UNUSED_FUNCTION = YES;
833855
GCC_WARN_UNUSED_VARIABLE = YES;
834-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
856+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
835857
MTL_ENABLE_DEBUG_INFO = NO;
836858
SDKROOT = iphoneos;
837859
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -848,21 +870,22 @@
848870
CLANG_ENABLE_MODULES = YES;
849871
CODE_SIGN_IDENTITY = "";
850872
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
873+
CODE_SIGN_STYLE = Manual;
851874
DEFINES_MODULE = YES;
852875
DEVELOPMENT_TEAM = "";
853876
DYLIB_COMPATIBILITY_VERSION = 1;
854877
DYLIB_CURRENT_VERSION = 1;
855878
DYLIB_INSTALL_NAME_BASE = "@rpath";
856879
INFOPLIST_FILE = Highlightr/Info.plist;
857880
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
858-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
881+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
859882
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
860883
PRODUCT_BUNDLE_IDENTIFIER = com.raspu.Highlightr;
861884
PRODUCT_NAME = Highlightr;
862885
PROVISIONING_PROFILE_SPECIFIER = "";
863886
SKIP_INSTALL = YES;
864887
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
865-
SWIFT_VERSION = 4.0;
888+
SWIFT_VERSION = 5.0;
866889
};
867890
name = Debug;
868891
};
@@ -872,27 +895,29 @@
872895
CLANG_ENABLE_MODULES = YES;
873896
CODE_SIGN_IDENTITY = "";
874897
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
898+
CODE_SIGN_STYLE = Manual;
875899
DEFINES_MODULE = YES;
876900
DEVELOPMENT_TEAM = "";
877901
DYLIB_COMPATIBILITY_VERSION = 1;
878902
DYLIB_CURRENT_VERSION = 1;
879903
DYLIB_INSTALL_NAME_BASE = "@rpath";
880904
INFOPLIST_FILE = Highlightr/Info.plist;
881905
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
882-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
906+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
883907
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
884908
PRODUCT_BUNDLE_IDENTIFIER = com.raspu.Highlightr;
885909
PRODUCT_NAME = Highlightr;
886910
PROVISIONING_PROFILE_SPECIFIER = "";
887911
SKIP_INSTALL = YES;
888-
SWIFT_VERSION = 4.0;
912+
SWIFT_VERSION = 5.0;
889913
};
890914
name = Release;
891915
};
892916
8CD1AE1C1F391713000FDA02 /* Debug */ = {
893917
isa = XCBuildConfiguration;
894918
buildSettings = {
895-
CODE_SIGN_IDENTITY = "Mac Developer";
919+
CODE_SIGN_IDENTITY = "";
920+
CODE_SIGN_STYLE = Manual;
896921
COMBINE_HIDPI_IMAGES = YES;
897922
DEFINES_MODULE = YES;
898923
DEVELOPMENT_TEAM = "";
@@ -909,14 +934,15 @@
909934
PROVISIONING_PROFILE_SPECIFIER = "";
910935
SDKROOT = macosx;
911936
SKIP_INSTALL = YES;
912-
SWIFT_VERSION = 4.0;
937+
SWIFT_VERSION = 5.0;
913938
};
914939
name = Debug;
915940
};
916941
8CD1AE1D1F391713000FDA02 /* Release */ = {
917942
isa = XCBuildConfiguration;
918943
buildSettings = {
919-
CODE_SIGN_IDENTITY = "Mac Developer";
944+
CODE_SIGN_IDENTITY = "";
945+
CODE_SIGN_STYLE = Manual;
920946
COMBINE_HIDPI_IMAGES = YES;
921947
DEFINES_MODULE = YES;
922948
DEVELOPMENT_TEAM = "";
@@ -933,7 +959,7 @@
933959
PROVISIONING_PROFILE_SPECIFIER = "";
934960
SDKROOT = macosx;
935961
SKIP_INSTALL = YES;
936-
SWIFT_VERSION = 4.0;
962+
SWIFT_VERSION = 5.0;
937963
};
938964
name = Release;
939965
};

‎Highlightr.xcodeproj/xcshareddata/xcschemes/Highlightr-iOS.xcscheme‎

Lines changed: 1 addition & 5 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 = "0830"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Highlightr.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎Highlightr.xcodeproj/xcshareddata/xcschemes/Highlightr-macOS.xcscheme‎

Lines changed: 1 addition & 5 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 = "0830"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Highlightr.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎Pod/Classes/Theme.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ open class Theme {
152152
}
153153
else
154154
{
155-
returnString = NSAttributedString(string: string, attributes:[AttributedStringKey.font:codeFont] )
155+
returnString = NSAttributedString(string: string, attributes:[AttributedStringKey.font:codeFont as Any] )
156156
}
157-
157+
158158
return returnString
159159
}
160160

@@ -328,7 +328,7 @@ open class Theme {
328328
}
329329

330330

331-
var r:CUnsignedInt = 0, g:CUnsignedInt = 0, b:CUnsignedInt = 0;
331+
var r:UInt64 = 0, g:UInt64 = 0, b:UInt64 = 0;
332332
var divisor : CGFloat
333333

334334
if (cString.count == 6 )
@@ -338,9 +338,9 @@ open class Theme {
338338
let gString = ((cString as NSString).substring(from: 2) as NSString).substring(to: 2)
339339
let bString = ((cString as NSString).substring(from: 4) as NSString).substring(to: 2)
340340

341-
Scanner(string: rString).scanHexInt32(&r)
342-
Scanner(string: gString).scanHexInt32(&g)
343-
Scanner(string: bString).scanHexInt32(&b)
341+
Scanner(string: rString).scanHexInt64(&r)
342+
Scanner(string: gString).scanHexInt64(&g)
343+
Scanner(string: bString).scanHexInt64(&b)
344344

345345
divisor = 255.0
346346

@@ -350,9 +350,9 @@ open class Theme {
350350
let gString = ((cString as NSString).substring(from: 1) as NSString).substring(to: 1)
351351
let bString = ((cString as NSString).substring(from: 2) as NSString).substring(to: 1)
352352

353-
Scanner(string: rString).scanHexInt32(&r)
354-
Scanner(string: gString).scanHexInt32(&g)
355-
Scanner(string: bString).scanHexInt32(&b)
353+
Scanner(string: rString).scanHexInt64(&r)
354+
Scanner(string: gString).scanHexInt64(&g)
355+
Scanner(string: bString).scanHexInt64(&b)
356356

357357
divisor = 15.0
358358
}

0 commit comments

Comments
 (0)