Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Commit c6d64b3

Browse files
shincurryshincurry
committed
update dependencies
1 parent 74b4e19 commit c6d64b3

File tree

7 files changed

+59
-91
lines changed

7 files changed

+59
-91
lines changed

‎Maria.xcodeproj/project.pbxproj

+15-39
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@
343343
88298CF11D41E56500BBAFE8 /* Sources */,
344344
88298CF21D41E56500BBAFE8 /* Frameworks */,
345345
88298CF31D41E56500BBAFE8 /* Resources */,
346-
1B079802347C60E6FD931C7F /* [CP] Copy Pods Resources */,
347346
);
348347
buildRules = (
349348
);
@@ -364,7 +363,6 @@
364363
8894856D1CBE4D4A000839CD /* Resources */,
365364
889485A61CBE4E44000839CD /* Embed App Extensions */,
366365
382446954F88BE724F1E9D7A /* [CP] Embed Pods Frameworks */,
367-
051F856055CCB610BCF8167E /* [CP] Copy Pods Resources */,
368366
8869D6961D7FD1C50009D65F /* Embed Frameworks */,
369367
);
370368
buildRules = (
@@ -384,12 +382,12 @@
384382
isa = PBXProject;
385383
attributes = {
386384
LastSwiftUpdateCheck = 0800;
387-
LastUpgradeCheck = 0900;
385+
LastUpgradeCheck = 0930;
388386
ORGANIZATIONNAME = ShinCurry;
389387
TargetAttributes = {
390388
88298CF41D41E56500BBAFE8 = {
391389
CreatedOnToolsVersion = 8.0;
392-
DevelopmentTeam = 8D95HCDEJR;
390+
DevelopmentTeam = 525R2U87NG;
393391
DevelopmentTeamName = "Debra Dean";
394392
LastSwiftMigration = 0900;
395393
ProvisioningStyle = Automatic;
@@ -404,7 +402,7 @@
404402
};
405403
8894856E1CBE4D4A000839CD = {
406404
CreatedOnToolsVersion = 7.3;
407-
DevelopmentTeam = 8D95HCDEJR;
405+
DevelopmentTeam = 525R2U87NG;
408406
DevelopmentTeamName = "Debra Dean";
409407
LastSwiftMigration = 0900;
410408
ProvisioningStyle = Automatic;
@@ -474,36 +472,6 @@
474472
/* End PBXResourcesBuildPhase section */
475473

476474
/* Begin PBXShellScriptBuildPhase section */
477-
051F856055CCB610BCF8167E /* [CP] Copy Pods Resources */ = {
478-
isa = PBXShellScriptBuildPhase;
479-
buildActionMask = 2147483647;
480-
files = (
481-
);
482-
inputPaths = (
483-
);
484-
name = "[CP] Copy Pods Resources";
485-
outputPaths = (
486-
);
487-
runOnlyForDeploymentPostprocessing = 0;
488-
shellPath = /bin/sh;
489-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Maria/Pods-Maria-resources.sh\"\n";
490-
showEnvVarsInLog = 0;
491-
};
492-
1B079802347C60E6FD931C7F /* [CP] Copy Pods Resources */ = {
493-
isa = PBXShellScriptBuildPhase;
494-
buildActionMask = 2147483647;
495-
files = (
496-
);
497-
inputPaths = (
498-
);
499-
name = "[CP] Copy Pods Resources";
500-
outputPaths = (
501-
);
502-
runOnlyForDeploymentPostprocessing = 0;
503-
shellPath = /bin/sh;
504-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Maria Widget/Pods-Maria Widget-resources.sh\"\n";
505-
showEnvVarsInLog = 0;
506-
};
507475
382446954F88BE724F1E9D7A /* [CP] Embed Pods Frameworks */ = {
508476
isa = PBXShellScriptBuildPhase;
509477
buildActionMask = 2147483647;
@@ -689,7 +657,7 @@
689657
CODE_SIGN_ENTITLEMENTS = "Maria Widget/Maria Widget.entitlements";
690658
CODE_SIGN_IDENTITY = "Mac Developer";
691659
COMBINE_HIDPI_IMAGES = YES;
692-
DEVELOPMENT_TEAM = 8D95HCDEJR;
660+
DEVELOPMENT_TEAM = 525R2U87NG;
693661
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
694662
INFOPLIST_FILE = "Maria Widget/Info.plist";
695663
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
@@ -714,7 +682,7 @@
714682
CODE_SIGN_ENTITLEMENTS = "Maria Widget/Maria Widget.entitlements";
715683
CODE_SIGN_IDENTITY = "Mac Developer";
716684
COMBINE_HIDPI_IMAGES = YES;
717-
DEVELOPMENT_TEAM = 8D95HCDEJR;
685+
DEVELOPMENT_TEAM = 525R2U87NG;
718686
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
719687
INFOPLIST_FILE = "Maria Widget/Info.plist";
720688
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
@@ -742,12 +710,14 @@
742710
CLANG_WARN_BOOL_CONVERSION = YES;
743711
CLANG_WARN_COMMA = YES;
744712
CLANG_WARN_CONSTANT_CONVERSION = YES;
713+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
745714
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
746715
CLANG_WARN_EMPTY_BODY = YES;
747716
CLANG_WARN_ENUM_CONVERSION = YES;
748717
CLANG_WARN_INFINITE_RECURSION = YES;
749718
CLANG_WARN_INT_CONVERSION = YES;
750719
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
720+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
751721
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
752722
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
753723
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -796,12 +766,14 @@
796766
CLANG_WARN_BOOL_CONVERSION = YES;
797767
CLANG_WARN_COMMA = YES;
798768
CLANG_WARN_CONSTANT_CONVERSION = YES;
769+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
799770
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
800771
CLANG_WARN_EMPTY_BODY = YES;
801772
CLANG_WARN_ENUM_CONVERSION = YES;
802773
CLANG_WARN_INFINITE_RECURSION = YES;
803774
CLANG_WARN_INT_CONVERSION = YES;
804775
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
776+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
805777
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
806778
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
807779
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -839,15 +811,17 @@
839811
CLANG_ENABLE_MODULES = YES;
840812
CODE_SIGN_ENTITLEMENTS = Maria/Maria.entitlements;
841813
CODE_SIGN_IDENTITY = "Mac Developer";
814+
CODE_SIGN_STYLE = Automatic;
842815
COMBINE_HIDPI_IMAGES = YES;
843816
DEFINES_MODULE = YES;
844-
DEVELOPMENT_TEAM = 8D95HCDEJR;
817+
DEVELOPMENT_TEAM = "";
845818
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
846819
INFOPLIST_FILE = Maria/Info.plist;
847820
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
848821
MACOSX_DEPLOYMENT_TARGET = 10.10;
849822
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Maria;
850823
PRODUCT_NAME = "$(TARGET_NAME)";
824+
PROVISIONING_PROFILE_SPECIFIER = "";
851825
SWIFT_OBJC_BRIDGING_HEADER = "Maria-Bridging-Header.h";
852826
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
853827
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -866,15 +840,17 @@
866840
CLANG_ENABLE_MODULES = YES;
867841
CODE_SIGN_ENTITLEMENTS = Maria/Maria.entitlements;
868842
CODE_SIGN_IDENTITY = "Mac Developer";
843+
CODE_SIGN_STYLE = Automatic;
869844
COMBINE_HIDPI_IMAGES = YES;
870845
DEFINES_MODULE = YES;
871-
DEVELOPMENT_TEAM = 8D95HCDEJR;
846+
DEVELOPMENT_TEAM = "";
872847
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
873848
INFOPLIST_FILE = Maria/Info.plist;
874849
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
875850
MACOSX_DEPLOYMENT_TARGET = 10.10;
876851
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Maria;
877852
PRODUCT_NAME = "$(TARGET_NAME)";
853+
PROVISIONING_PROFILE_SPECIFIER = "";
878854
SWIFT_OBJC_BRIDGING_HEADER = "Maria-Bridging-Header.h";
879855
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
880856
SWIFT_SWIFT3_OBJC_INFERENCE = Off;

‎Maria.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Maria/AriaConfig.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ extension AriaConfig {
125125
let regex: NSRegularExpression
126126
do {
127127
try regex = NSRegularExpression(pattern: pattern, options: .caseInsensitive)
128-
let matches = regex.matches(in: item, options: [], range: NSMakeRange(0, item.characters.count))
128+
let matches = regex.matches(in: item, options: [], range: NSMakeRange(0, item.count))
129129
return matches.count == 0 ? true : false
130130
} catch {
131131
print(error)

‎Maria/Base.lproj/Main.storyboard

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="5mb-Q8-ck4">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="5mb-Q8-ck4">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13168.3"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
66
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
77
<capability name="box content view" minToolsVersion="7.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -788,7 +788,7 @@
788788
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qAc-gW-pQT">
789789
<rect key="frame" x="292" y="13" width="82" height="32"/>
790790
<constraints>
791-
<constraint firstAttribute="width" constant="70" id="L0A-eZ-eX5"/>
791+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="L0A-eZ-eX5"/>
792792
</constraints>
793793
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="z1n-Qy-sY5">
794794
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -822,7 +822,7 @@ Gw
822822
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nM7-o5-2jr">
823823
<rect key="frame" x="370" y="13" width="82" height="32"/>
824824
<constraints>
825-
<constraint firstAttribute="width" constant="70" id="sSB-Cj-Vu2"/>
825+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="sSB-Cj-Vu2"/>
826826
</constraints>
827827
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="K7r-6T-5XW">
828828
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -1130,8 +1130,8 @@ AAAAAAAAAAAAAAAAABDLA
11301130
</image>
11311131
</resources>
11321132
<inferredMetricsTieBreakers>
1133+
<segue reference="zaZ-iz-Pj8"/>
11331134
<segue reference="uT7-5m-1AB"/>
11341135
<segue reference="dLI-9M-ESM"/>
1135-
<segue reference="zaZ-iz-Pj8"/>
11361136
</inferredMetricsTieBreakers>
11371137
</document>

‎Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ project 'Maria.xcodeproj'
88
project 'YouGet.xcodeproj'
99

1010
def starscream
11-
pod 'Starscream', :git => 'https://github.com/daltoniam/Starscream.git'
11+
pod 'Starscream', '~> 3.0'
1212
end
1313

1414
def swifty_json
15-
pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git'
15+
pod 'SwiftyJSON', '~> 4.0'
1616
end
1717

1818
def swifty_userdefaults

‎Podfile.lock

+21-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
PODS:
22
- Aria2Core (1.0.1)
33
- Aria2RPC (1.0.1):
4-
- Starscream (~> 2.1.0)
5-
- SwiftyJSON (~> 3.1.4)
6-
- Sparkle (1.17.0)
7-
- Starscream (2.1.0)
8-
- SwiftyJSON (3.1.4)
4+
- Starscream (~> 3.0)
5+
- SwiftyJSON (~> 4.0)
6+
- Sparkle (1.19.0)
7+
- Starscream (3.0.5)
8+
- SwiftyJSON (4.1.0)
99
- SwiftyUserDefaults (3.0.1)
1010

1111
DEPENDENCIES:
1212
- Aria2Core (from `https://github.com/ShinCurry/Aria2Core.git`)
1313
- Aria2RPC (from `https://github.com/ShinCurry/Aria2RPC.git`)
1414
- Sparkle
15-
- Starscream (from `https://github.com/daltoniam/Starscream.git`)
16-
- SwiftyJSON (from `https://github.com/SwiftyJSON/SwiftyJSON.git`)
15+
- Starscream (~> 3.0)
16+
- SwiftyJSON (~> 4.0)
1717
- SwiftyUserDefaults (from `https://github.com/radex/SwiftyUserDefaults.git`)
1818

19+
SPEC REPOS:
20+
https://github.com/CocoaPods/Specs.git:
21+
- Sparkle
22+
- Starscream
23+
- SwiftyJSON
24+
1925
EXTERNAL SOURCES:
2026
Aria2Core:
2127
:git: https://github.com/ShinCurry/Aria2Core.git
2228
Aria2RPC:
2329
:git: https://github.com/ShinCurry/Aria2RPC.git
24-
Starscream:
25-
:git: https://github.com/daltoniam/Starscream.git
26-
SwiftyJSON:
27-
:git: https://github.com/SwiftyJSON/SwiftyJSON.git
2830
SwiftyUserDefaults:
2931
:git: https://github.com/radex/SwiftyUserDefaults.git
3032

@@ -33,26 +35,20 @@ CHECKOUT OPTIONS:
3335
:commit: c84b77776a2ecbd3ae92a5d7f4f67cba9c32070c
3436
:git: https://github.com/ShinCurry/Aria2Core.git
3537
Aria2RPC:
36-
:commit: 536695466ba0ea0d82c044831c9ee4fa2337bf85
38+
:commit: 0019e25056655346b0f538b7652b36d47e30d9db
3739
:git: https://github.com/ShinCurry/Aria2RPC.git
38-
Starscream:
39-
:commit: b0ed1decce701c1933e04505a9e89fa4a9f55272
40-
:git: https://github.com/daltoniam/Starscream.git
41-
SwiftyJSON:
42-
:commit: ebc305b69ecca005b636f20e0db4d07d19d333fa
43-
:git: https://github.com/SwiftyJSON/SwiftyJSON.git
4440
SwiftyUserDefaults:
45-
:commit: 7ddd886fc33e9cc06d178b8fe9c0c46cfa4b9bb9
41+
:commit: 14b629b035bf6355b46ece22c3851068a488a895
4642
:git: https://github.com/radex/SwiftyUserDefaults.git
4743

4844
SPEC CHECKSUMS:
4945
Aria2Core: 8e139f76da8f6509a6a14cc3e5cf27c379be2046
50-
Aria2RPC: adaeaec16acf7ba830a5b9962064f7b13bc1c9b3
51-
Sparkle: ccfb47699feea7b40b51cf3176f69404e5b1da6c
52-
Starscream: 7c901b0fdb10244077b1da380744a14824924718
53-
SwiftyJSON: 05cf0e98a950e2ba343735264f5a96b81e755d00
46+
Aria2RPC: e244bdf623db21b2bbf7816c899a5c9aa281f041
47+
Sparkle: 8486d2493599665e466b5076e72b28849776e32f
48+
Starscream: faf918b2f2eff7d5dd21180646bf015a669673bd
49+
SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
5450
SwiftyUserDefaults: 38267a30d58b7c8570995cd5defd354e43f056c6
5551

56-
PODFILE CHECKSUM: ab61c62e5318c7b4e67b9bfbda409396238b9495
52+
PODFILE CHECKSUM: b6176bd6d67632d050eaaa906f0ff732ee1253c9
5753

58-
COCOAPODS: 1.3.0.beta.2
54+
COCOAPODS: 1.5.0

0 commit comments

Comments
 (0)