diff --git a/Aria2D.xcodeproj/project.pbxproj b/Aria2D.xcodeproj/project.pbxproj index 00c1666..0f14f27 100644 --- a/Aria2D.xcodeproj/project.pbxproj +++ b/Aria2D.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -540,8 +540,9 @@ 0147EDB51D21FAD800FB4324 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 1220; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = xjbeta; TargetAttributes = { 0147EDBC1D21FAD800FB4324 = { @@ -788,6 +789,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -817,6 +819,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = H7NSMSBU6A; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -850,6 +853,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -879,6 +883,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = H7NSMSBU6A; ENABLE_NS_ASSERTIONS = NO; @@ -912,19 +917,21 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "$(SRCROOT)/Aria2D/Resources/Info.plist"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.3.8; + MARKETING_VERSION = 1.3.9; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; @@ -950,6 +957,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -957,13 +965,14 @@ GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "$(SRCROOT)/Aria2D/Resources/Info.plist"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.3.8; + MARKETING_VERSION = 1.3.9; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; OTHER_SWIFT_FLAGS = ""; @@ -1020,7 +1029,7 @@ repositoryURL = "https://github.com/mxcl/PromiseKit"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 6.0.0; + minimumVersion = 8.0.0; }; }; 01F87CBD289B670200B0ED8F /* XCRemoteSwiftPackageReference "Foundation" */ = { @@ -1028,7 +1037,7 @@ repositoryURL = "https://github.com/PromiseKit/Foundation"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 3.0.0; + minimumVersion = 4.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Aria2D.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Aria2D.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c15ccf2..05baf04 100644 --- a/Aria2D.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Aria2D.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/PromiseKit/Foundation", "state" : { - "revision" : "985f17fa69ee0e5b7eb3ff9be87ffc4e05fc0927", - "version" : "3.4.0" + "revision" : "d967438f58183e02f091f4c17ac7f04f70947e0a", + "version" : "4.0.0" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mxcl/PromiseKit", "state" : { - "revision" : "8a98e31a47854d3180882c8068cc4d9381bf382d", - "version" : "6.22.1" + "revision" : "cb70b070cde06837cd10a1febdf6105c1a3bb348", + "version" : "8.1.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/sparkle-project/Sparkle", "state" : { - "revision" : "87e4fcbac39912f9cdb9a9acf205cad60e1ca3bc", - "version" : "2.4.2" + "revision" : "1f07f4096e52f19b5e7abaa697b7fc592b7ff57c", + "version" : "2.5.1" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/daltoniam/Starscream", "state" : { - "revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21", - "version" : "4.0.4" + "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version" : "4.0.6" } } ], diff --git a/Aria2D.xcodeproj/xcuserdata/xjbeta.xcuserdatad/xcschemes/Aria2D.xcscheme b/Aria2D.xcodeproj/xcuserdata/xjbeta.xcuserdatad/xcschemes/Aria2D.xcscheme index 02d9189..a28f130 100644 --- a/Aria2D.xcodeproj/xcuserdata/xjbeta.xcuserdatad/xcschemes/Aria2D.xcscheme +++ b/Aria2D.xcodeproj/xcuserdata/xjbeta.xcuserdatad/xcschemes/Aria2D.xcscheme @@ -1,6 +1,6 @@ - + - + @@ -11,28 +11,28 @@ - + - + - + - + - + - - + + @@ -42,7 +42,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/Aria2D/Views/Base.lproj/InstallAria2GuideWindow.storyboard b/Aria2D/Views/Base.lproj/InstallAria2GuideWindow.storyboard index 6ff0413..2f3e23b 100644 --- a/Aria2D/Views/Base.lproj/InstallAria2GuideWindow.storyboard +++ b/Aria2D/Views/Base.lproj/InstallAria2GuideWindow.storyboard @@ -1,8 +1,8 @@ - + - + @@ -32,20 +32,20 @@ - + - + - + - + @@ -57,8 +57,8 @@ - - + + @@ -68,7 +68,7 @@ - - + + @@ -1092,7 +1092,7 @@ CA - + @@ -1107,7 +1107,7 @@ CA - + @@ -1243,7 +1243,7 @@ Gw - + @@ -1289,7 +1289,7 @@ Gw - + @@ -1301,7 +1301,7 @@ Gw - + @@ -1313,7 +1313,7 @@ Gw - + @@ -1325,7 +1325,7 @@ Gw - + @@ -1360,9 +1360,6 @@ Gw - + @@ -2158,7 +2158,7 @@ DQ - + @@ -2179,7 +2179,7 @@ DQ - + @@ -2194,8 +2194,8 @@ DQ - - + + @@ -2205,7 +2205,7 @@ DQ - + @@ -2231,7 +2231,7 @@ DQ - + diff --git a/Aria2D/Views/Base.lproj/Preferences.storyboard b/Aria2D/Views/Base.lproj/Preferences.storyboard index f512027..5097206 100644 --- a/Aria2D/Views/Base.lproj/Preferences.storyboard +++ b/Aria2D/Views/Base.lproj/Preferences.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -54,7 +53,7 @@ - + @@ -70,7 +69,7 @@ - + @@ -770,7 +769,7 @@ - + @@ -783,7 +782,7 @@ - + @@ -793,7 +792,7 @@ - + @@ -806,7 +805,7 @@ - + @@ -816,7 +815,7 @@ - + @@ -917,7 +916,7 @@ - + @@ -962,8 +961,8 @@ DQ - - + + @@ -972,8 +971,8 @@ DQ - - + + @@ -982,8 +981,8 @@ DQ - - + + @@ -992,8 +991,8 @@ DQ - - + + @@ -1002,8 +1001,8 @@ DQ - - + + @@ -1013,17 +1012,17 @@ DQ - + - + - + - + @@ -1034,7 +1033,7 @@ DQ - + @@ -1077,7 +1076,7 @@ DQ - + @@ -1086,7 +1085,7 @@ DQ - + @@ -1133,7 +1132,7 @@ Gw - + - + - + - + - + @@ -1240,7 +1239,7 @@ Gw - + @@ -1295,10 +1294,10 @@ Gw - + - + @@ -1318,7 +1317,7 @@ Gw - + @@ -1327,7 +1326,7 @@ Gw - + - + @@ -1355,16 +1354,16 @@ Gw - - + + - - + + @@ -1391,24 +1390,24 @@ Gw - - + + - - + + - - + + @@ -1425,40 +1424,40 @@ Gw - - + + - - + + - - + + - - + + - - + + @@ -1540,6 +1539,7 @@ Gw host + @@ -1547,11 +1547,11 @@ Gw - + - + @@ -1563,9 +1563,8 @@ Gw - + - @@ -1580,7 +1579,7 @@ Gw - + @@ -1628,7 +1627,7 @@ Gw - +