Skip to content

Commit 3c3e113

Browse files
committed
Build for Apple Silicon, fix some warnings
1 parent 85040b9 commit 3c3e113

File tree

10 files changed

+160
-106
lines changed

10 files changed

+160
-106
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Follow me on Twitter: [@nicoSWD](https://twitter.com/nicoSWD)!
1717

1818
| Version | Downloads |
1919
|:----------:|:---------------:|
20-
| **[put.io adder v3.0.4](https://github.com/nicoSWD/put.io-adder/releases/download/v3.0.4/put.io-adder-v3.0.4.zip)** | ![total](https://img.shields.io/github/downloads/nicoSWD/put.io-adder/total.svg?maxAge=25920)
20+
| **[put.io adder v3.0.5](https://github.com/nicoSWD/put.io-adder/releases/download/v3.0.5/put.io-adder-v3.0.5.zip)** | ![total](https://img.shields.io/github/downloads/nicoSWD/put.io-adder/total.svg?maxAge=25920)
2121

2222
(Older releases can be found [here](https://github.com/nicoSWD/put.io-adder/releases/))
2323

put.io adder.xcodeproj/project.pbxproj

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -54,6 +54,7 @@
5454
03AE9CBE17861CBA00A6E3EF /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03AE9CBD17861CBA00A6E3EF /* WebKit.framework */; };
5555
03AE9CC01786398200A6E3EF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03AE9CBF1786398200A6E3EF /* Security.framework */; };
5656
03BCC0481895A2D300DF1FA3 /* puticon.png in Resources */ = {isa = PBXBuildFile; fileRef = 03BCC0471895A2D300DF1FA3 /* puticon.png */; };
57+
03CA4EB82C0C78F800E211BD /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03CA4EB72C0C78F800E211BD /* UserNotifications.framework */; };
5758
03CD1E7719FAB1470047B927 /* logo2.png in Resources */ = {isa = PBXBuildFile; fileRef = 03CD1E7619FAB1470047B927 /* logo2.png */; };
5859
03DF597D17884AAB00AC96AA /* github.png in Resources */ = {isa = PBXBuildFile; fileRef = 03DF597B17884AAB00AC96AA /* github.png */; };
5960
03DF597E17884AAB00AC96AA /* github@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 03DF597C17884AAB00AC96AA /* github@2x.png */; };
@@ -159,6 +160,7 @@
159160
03AE9CBD17861CBA00A6E3EF /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
160161
03AE9CBF1786398200A6E3EF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
161162
03BCC0471895A2D300DF1FA3 /* puticon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = puticon.png; path = Resources/puticon.png; sourceTree = "<group>"; };
163+
03CA4EB72C0C78F800E211BD /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
162164
03CD1E7619FAB1470047B927 /* logo2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo2.png; sourceTree = "<group>"; };
163165
03DF597B17884AAB00AC96AA /* github.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = github.png; path = Resources/github.png; sourceTree = "<group>"; };
164166
03DF597C17884AAB00AC96AA /* github@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "github@2x.png"; path = "Resources/github@2x.png"; sourceTree = "<group>"; };
@@ -189,6 +191,7 @@
189191
isa = PBXFrameworksBuildPhase;
190192
buildActionMask = 2147483647;
191193
files = (
194+
03CA4EB82C0C78F800E211BD /* UserNotifications.framework in Frameworks */,
192195
0307180E1A054D8F0099847C /* Quartz.framework in Frameworks */,
193196
03AE9CC01786398200A6E3EF /* Security.framework in Frameworks */,
194197
03AE9CBE17861CBA00A6E3EF /* WebKit.framework in Frameworks */,
@@ -332,6 +335,7 @@
332335
03F630C616D6B5D400D33848 /* Frameworks */ = {
333336
isa = PBXGroup;
334337
children = (
338+
03CA4EB72C0C78F800E211BD /* UserNotifications.framework */,
335339
0307180D1A054D8F0099847C /* Quartz.framework */,
336340
03AE9CBF1786398200A6E3EF /* Security.framework */,
337341
03AE9CBD17861CBA00A6E3EF /* WebKit.framework */,
@@ -440,12 +444,12 @@
440444
03F630BC16D6B5D300D33848 /* Project object */ = {
441445
isa = PBXProject;
442446
attributes = {
447+
BuildIndependentTargetsInParallel = YES;
443448
CLASSPREFIX = Putio;
444-
LastUpgradeCheck = 0500;
449+
LastUpgradeCheck = 1540;
445450
ORGANIZATIONNAME = "Nicolas Oelgart";
446451
TargetAttributes = {
447452
03F630C316D6B5D400D33848 = {
448-
DevelopmentTeam = 8JR6HMQNDE;
449453
SystemCapabilities = {
450454
com.apple.Keychain = {
451455
enabled = 1;
@@ -462,6 +466,7 @@
462466
developmentRegion = English;
463467
hasScannedForEncodings = 0;
464468
knownRegions = (
469+
English,
465470
en,
466471
es,
467472
de,
@@ -587,19 +592,37 @@
587592
isa = XCBuildConfiguration;
588593
buildSettings = {
589594
ALWAYS_SEARCH_USER_PATHS = NO;
590-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
595+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
591596
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
592597
CLANG_CXX_LIBRARY = "libc++";
593598
CLANG_ENABLE_OBJC_ARC = YES;
599+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
600+
CLANG_WARN_BOOL_CONVERSION = YES;
601+
CLANG_WARN_COMMA = YES;
594602
CLANG_WARN_CONSTANT_CONVERSION = YES;
603+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
595604
CLANG_WARN_EMPTY_BODY = YES;
596605
CLANG_WARN_ENUM_CONVERSION = YES;
606+
CLANG_WARN_INFINITE_RECURSION = YES;
597607
CLANG_WARN_INT_CONVERSION = YES;
608+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
609+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
610+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
611+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
612+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
613+
CLANG_WARN_STRICT_PROTOTYPES = YES;
614+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
615+
CLANG_WARN_UNREACHABLE_CODE = YES;
598616
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
599617
COPY_PHASE_STRIP = NO;
618+
DEAD_CODE_STRIPPING = YES;
619+
ENABLE_STRICT_OBJC_MSGSEND = YES;
620+
ENABLE_TESTABILITY = YES;
621+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
600622
GCC_C_LANGUAGE_STANDARD = gnu99;
601623
GCC_DYNAMIC_NO_PIC = NO;
602624
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
625+
GCC_NO_COMMON_BLOCKS = YES;
603626
GCC_OPTIMIZATION_LEVEL = 0;
604627
GCC_PREPROCESSOR_DEFINITIONS = (
605628
"DEBUG=1",
@@ -608,60 +631,85 @@
608631
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
609632
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
610633
GCC_WARN_ABOUT_RETURN_TYPE = YES;
634+
GCC_WARN_UNDECLARED_SELECTOR = YES;
611635
GCC_WARN_UNINITIALIZED_AUTOS = YES;
636+
GCC_WARN_UNUSED_FUNCTION = YES;
612637
GCC_WARN_UNUSED_VARIABLE = YES;
613638
MACOSX_DEPLOYMENT_TARGET = 10.8;
614639
ONLY_ACTIVE_ARCH = YES;
615-
SDKROOT = macosx10.7;
640+
SDKROOT = macosx;
616641
};
617642
name = Debug;
618643
};
619644
03F630E316D6B5D400D33848 /* Release */ = {
620645
isa = XCBuildConfiguration;
621646
buildSettings = {
622647
ALWAYS_SEARCH_USER_PATHS = NO;
623-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
648+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
624649
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
625650
CLANG_CXX_LIBRARY = "libc++";
626651
CLANG_ENABLE_OBJC_ARC = YES;
652+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
653+
CLANG_WARN_BOOL_CONVERSION = YES;
654+
CLANG_WARN_COMMA = YES;
627655
CLANG_WARN_CONSTANT_CONVERSION = YES;
656+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
628657
CLANG_WARN_EMPTY_BODY = YES;
629658
CLANG_WARN_ENUM_CONVERSION = YES;
659+
CLANG_WARN_INFINITE_RECURSION = YES;
630660
CLANG_WARN_INT_CONVERSION = YES;
661+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
662+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
663+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
664+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
665+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
666+
CLANG_WARN_STRICT_PROTOTYPES = YES;
667+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
668+
CLANG_WARN_UNREACHABLE_CODE = YES;
631669
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
632670
COPY_PHASE_STRIP = YES;
671+
DEAD_CODE_STRIPPING = YES;
633672
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
673+
ENABLE_STRICT_OBJC_MSGSEND = YES;
674+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
634675
GCC_C_LANGUAGE_STANDARD = gnu99;
635676
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
677+
GCC_NO_COMMON_BLOCKS = YES;
636678
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
637679
GCC_WARN_ABOUT_RETURN_TYPE = YES;
680+
GCC_WARN_UNDECLARED_SELECTOR = YES;
638681
GCC_WARN_UNINITIALIZED_AUTOS = YES;
682+
GCC_WARN_UNUSED_FUNCTION = YES;
639683
GCC_WARN_UNUSED_VARIABLE = YES;
640684
MACOSX_DEPLOYMENT_TARGET = 10.8;
641-
SDKROOT = macosx10.7;
685+
SDKROOT = macosx;
642686
};
643687
name = Release;
644688
};
645689
03F630E516D6B5D400D33848 /* Debug */ = {
646690
isa = XCBuildConfiguration;
647691
buildSettings = {
648692
ALWAYS_SEARCH_USER_PATHS = NO;
649-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
693+
ARCHS = "$(ARCHS_STANDARD)";
650694
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
651695
CLANG_ENABLE_OBJC_ARC = YES;
652696
CODE_SIGN_ENTITLEMENTS = "put.io adder/put.io adder.entitlements";
653697
CODE_SIGN_IDENTITY = "Mac Developer";
654698
COMBINE_HIDPI_IMAGES = YES;
699+
DEAD_CODE_STRIPPING = YES;
700+
DEVELOPMENT_TEAM = 8JR6HMQNDE;
701+
ENABLE_HARDENED_RUNTIME = YES;
655702
GCC_OPTIMIZATION_LEVEL = s;
656703
GCC_PRECOMPILE_PREFIX_HEADER = YES;
657704
GCC_PREFIX_HEADER = "put.io adder/put.io adder-Prefix.pch";
658705
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
659706
INFOPLIST_FILE = "put.io adder/put.io adder-Info.plist";
660-
MACOSX_DEPLOYMENT_TARGET = 10.7;
707+
MACOSX_DEPLOYMENT_TARGET = 14.5;
708+
PRODUCT_BUNDLE_IDENTIFIER = "com.nicoswd.put-io-adder";
661709
PRODUCT_NAME = "$(TARGET_NAME)";
662710
SDKROOT = macosx;
663711
USER_HEADER_SEARCH_PATHS = "";
664-
VALID_ARCHS = "x86_64 i386";
712+
VALID_ARCHS = arm64;
665713
WRAPPER_EXTENSION = app;
666714
};
667715
name = Debug;
@@ -670,22 +718,26 @@
670718
isa = XCBuildConfiguration;
671719
buildSettings = {
672720
ALWAYS_SEARCH_USER_PATHS = NO;
673-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
721+
ARCHS = "$(ARCHS_STANDARD)";
674722
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
675723
CLANG_ENABLE_OBJC_ARC = YES;
676724
CODE_SIGN_ENTITLEMENTS = "put.io adder/put.io adder.entitlements";
677725
CODE_SIGN_IDENTITY = "Mac Developer";
678726
COMBINE_HIDPI_IMAGES = YES;
727+
DEAD_CODE_STRIPPING = YES;
728+
DEVELOPMENT_TEAM = 8JR6HMQNDE;
729+
ENABLE_HARDENED_RUNTIME = YES;
679730
GCC_PRECOMPILE_PREFIX_HEADER = YES;
680731
GCC_PREFIX_HEADER = "put.io adder/put.io adder-Prefix.pch";
681732
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
682733
INFOPLIST_FILE = "put.io adder/put.io adder-Info.plist";
683-
MACOSX_DEPLOYMENT_TARGET = 10.7;
734+
MACOSX_DEPLOYMENT_TARGET = 14.5;
684735
ONLY_ACTIVE_ARCH = YES;
736+
PRODUCT_BUNDLE_IDENTIFIER = "com.nicoswd.put-io-adder";
685737
PRODUCT_NAME = "$(TARGET_NAME)";
686738
SDKROOT = macosx;
687739
USER_HEADER_SEARCH_PATHS = "";
688-
VALID_ARCHS = "x86_64 i386";
740+
VALID_ARCHS = arm64;
689741
WRAPPER_EXTENSION = app;
690742
};
691743
name = Release;

put.io adder.xcodeproj/xcuserdata/Nico.xcuserdatad/xcschemes/put.io adder.xcscheme

Lines changed: 12 additions & 11 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 = "0500"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,12 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
30-
<Testables>
31-
</Testables>
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,17 +36,21 @@
3836
ReferencedContainer = "container:put.io adder.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
39+
<Testables>
40+
</Testables>
4141
</TestAction>
4242
<LaunchAction
43+
buildConfiguration = "Release"
4344
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4445
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4546
launchStyle = "0"
4647
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Release"
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
50+
debugServiceExtension = "internal"
5051
allowLocationSimulation = "YES">
51-
<BuildableProductRunnable>
52+
<BuildableProductRunnable
53+
runnableDebuggingMode = "0">
5254
<BuildableReference
5355
BuildableIdentifier = "primary"
5456
BlueprintIdentifier = "03F630C316D6B5D400D33848"
@@ -57,16 +59,15 @@
5759
ReferencedContainer = "container:put.io adder.xcodeproj">
5860
</BuildableReference>
5961
</BuildableProductRunnable>
60-
<AdditionalOptions>
61-
</AdditionalOptions>
6262
</LaunchAction>
6363
<ProfileAction
64+
buildConfiguration = "Release"
6465
shouldUseLaunchSchemeArgsEnv = "YES"
6566
savedToolIdentifier = ""
6667
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Release"
6868
debugDocumentVersioning = "YES">
69-
<BuildableProductRunnable>
69+
<BuildableProductRunnable
70+
runnableDebuggingMode = "0">
7071
<BuildableReference
7172
BuildableIdentifier = "primary"
7273
BlueprintIdentifier = "03F630C316D6B5D400D33848"

put.io adder.xcodeproj/xcuserdata/Nico.xcuserdatad/xcschemes/put.io-adder-ios.xcscheme

Lines changed: 12 additions & 11 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 = "0460"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,12 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
30-
<Testables>
31-
</Testables>
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,17 +36,21 @@
3836
ReferencedContainer = "container:put.io adder.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
39+
<Testables>
40+
</Testables>
4141
</TestAction>
4242
<LaunchAction
43+
buildConfiguration = "Debug"
4344
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4445
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4546
launchStyle = "0"
4647
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
50+
debugServiceExtension = "internal"
5051
allowLocationSimulation = "YES">
51-
<BuildableProductRunnable>
52+
<BuildableProductRunnable
53+
runnableDebuggingMode = "0">
5254
<BuildableReference
5355
BuildableIdentifier = "primary"
5456
BlueprintIdentifier = "034AC69E17907D6D00303CC9"
@@ -57,16 +59,15 @@
5759
ReferencedContainer = "container:put.io adder.xcodeproj">
5860
</BuildableReference>
5961
</BuildableProductRunnable>
60-
<AdditionalOptions>
61-
</AdditionalOptions>
6262
</LaunchAction>
6363
<ProfileAction
64+
buildConfiguration = "Release"
6465
shouldUseLaunchSchemeArgsEnv = "YES"
6566
savedToolIdentifier = ""
6667
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Release"
6868
debugDocumentVersioning = "YES">
69-
<BuildableProductRunnable>
69+
<BuildableProductRunnable
70+
runnableDebuggingMode = "0">
7071
<BuildableReference
7172
BuildableIdentifier = "primary"
7273
BlueprintIdentifier = "034AC69E17907D6D00303CC9"

0 commit comments

Comments
 (0)