Skip to content
This repository was archived by the owner on Jul 14, 2018. It is now read-only.

Commit e165b40

Browse files
committed
Bump up HaishinKit to 0.7.4
1 parent 147a743 commit e165b40

File tree

7 files changed

+13
-29
lines changed

7 files changed

+13
-29
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "shogo4405/HaishinKit.swift" ~> 0.7.3
1+
github "shogo4405/HaishinKit.swift" ~> 0.7.4
22
github "BradLarson/GPUImage"

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "BradLarson/GPUImage" "0.1.7"
2-
github "DaveWoodCom/XCGLogger" "5.0.1"
3-
github "shogo4405/HaishinKit.swift" "0.7.3"
2+
github "shogo4405/HaishinKit.swift" "0.7.4"
3+
github "shogo4405/Logboard" "1.0.1"

GPUHaishinKit.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |s|
22

33
s.name = "GPUHaishinKit"
4-
s.version = "1.1.3"
5-
s.summary = "Camera and Microphone streaming library via RTMP, HLS for iOS. Powered by GPUImage + HaishinKit(lf)"
4+
s.version = "1.1.4"
5+
s.summary = "Camera and Microphone streaming library via RTMP, HLS for iOS. Powered by GPUImage + HaishinKit"
66

77
s.description = <<-DESC
8-
GPUHaishinKit. Camera and Microphone streaming library via RTMP, HLS for iOS. Powered by GPUImage + HaishinKit(lf)
8+
GPUHaishinKit. Camera and Microphone streaming library via RTMP, HLS for iOS. Powered by GPUImage + HaishinKit
99
DESC
1010

1111
s.homepage = "https://github.com/shogo4405/GPUHaishinKit.swift"
@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
2020

2121
s.source_files = "Sources/**/*.swift"
2222
s.dependency 'GPUImage', '~> 0.1.7'
23-
s.dependency 'HaishinKit', '~> 0.7.3'
23+
s.dependency 'HaishinKit', '~> 0.7.4'
2424

2525
end

GPUHaishinKit.xcodeproj/project.pbxproj

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
292FA1D71E2A2B3F00F88072 /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */; };
1110
293874D61F35B01E009F4B30 /* HaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 293874D51F35B01E009F4B30 /* HaishinKit.framework */; };
1211
293874D81F35B03B009F4B30 /* HaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 293874D71F35B03B009F4B30 /* HaishinKit.framework */; };
13-
295747841E351C2B00EF056E /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */; };
1412
295747861E3520D800EF056E /* GPUHaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */; };
1513
2957478A1E35222E00EF056E /* GPUHaishinKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1614
295F9D791E62B4CA00B3569C /* GPUHaishinKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9D711E62B4CA00B3569C /* GPUHaishinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -29,11 +27,8 @@
2927
295F9DC11E62BE4900B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D21E2A2B3F00F88072 /* GPUImage.framework */; };
3028
295F9DC21E62BE5400B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; };
3129
295F9DC51E62BE6600B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D21E2A2B3F00F88072 /* GPUImage.framework */; };
32-
295F9DCA1E62C1E800B3569C /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; };
3330
298A74841E62D0A200870DBA /* GPUImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
34-
298A74881E62D0A200870DBA /* XCGLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3531
298A74891E62D0F100870DBA /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; };
36-
298A748B1E62D0F100870DBA /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; };
3732
298A748C1E62D10900870DBA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 295F9DB61E62BAF700B3569C /* Main.storyboard */; };
3833
298A74901E62DBAE00870DBA /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 298A748D1E62DBAE00870DBA /* Cartfile */; };
3934
298A74911E62DBAE00870DBA /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 298A748E1E62DBAE00870DBA /* LICENSE */; };
@@ -75,7 +70,6 @@
7570
dstSubfolderSpec = 10;
7671
files = (
7772
295F9D791E62B4CA00B3569C /* GPUHaishinKit.framework in Embed Frameworks */,
78-
298A74881E62D0A200870DBA /* XCGLogger.framework in Embed Frameworks */,
7973
298A74841E62D0A200870DBA /* GPUImage.framework in Embed Frameworks */,
8074
);
8175
name = "Embed Frameworks";
@@ -86,7 +80,6 @@
8680
/* Begin PBXFileReference section */
8781
292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GPUHaishinKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8882
292FA1D21E2A2B3F00F88072 /* GPUImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GPUImage.framework; path = Carthage/Build/iOS/GPUImage.framework; sourceTree = "<group>"; };
89-
292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCGLogger.framework; path = Carthage/Build/iOS/XCGLogger.framework; sourceTree = "<group>"; };
9083
293874D51F35B01E009F4B30 /* HaishinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HaishinKit.framework; path = Carthage/Build/iOS/HaishinKit.framework; sourceTree = "<group>"; };
9184
293874D71F35B03B009F4B30 /* HaishinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HaishinKit.framework; path = Carthage/Build/Mac/HaishinKit.framework; sourceTree = "<group>"; };
9285
295747701E351B1800EF056E /* Example-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -110,7 +103,6 @@
110103
295F9DB11E62BA9500B3569C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Examples/iOS/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
111104
295F9DB71E62BAF700B3569C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Examples/macOS/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
112105
295F9DBB1E62BE3E00B3569C /* GPUImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GPUImage.framework; path = Carthage/Build/Mac/GPUImage.framework; sourceTree = "<group>"; };
113-
295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCGLogger.framework; path = Carthage/Build/Mac/XCGLogger.framework; sourceTree = "<group>"; };
114106
298A748D1E62DBAE00870DBA /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
115107
298A748E1E62DBAE00870DBA /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
116108
298A748F1E62DBAE00870DBA /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -122,7 +114,6 @@
122114
buildActionMask = 2147483647;
123115
files = (
124116
293874D61F35B01E009F4B30 /* HaishinKit.framework in Frameworks */,
125-
292FA1D71E2A2B3F00F88072 /* XCGLogger.framework in Frameworks */,
126117
295F9DC11E62BE4900B3569C /* GPUImage.framework in Frameworks */,
127118
);
128119
runOnlyForDeploymentPostprocessing = 0;
@@ -132,7 +123,6 @@
132123
buildActionMask = 2147483647;
133124
files = (
134125
295F9DC51E62BE6600B3569C /* GPUImage.framework in Frameworks */,
135-
295747841E351C2B00EF056E /* XCGLogger.framework in Frameworks */,
136126
295747861E3520D800EF056E /* GPUHaishinKit.framework in Frameworks */,
137127
);
138128
runOnlyForDeploymentPostprocessing = 0;
@@ -142,7 +132,6 @@
142132
buildActionMask = 2147483647;
143133
files = (
144134
298A74891E62D0F100870DBA /* GPUImage.framework in Frameworks */,
145-
298A748B1E62D0F100870DBA /* XCGLogger.framework in Frameworks */,
146135
);
147136
runOnlyForDeploymentPostprocessing = 0;
148137
};
@@ -152,7 +141,6 @@
152141
files = (
153142
293874D81F35B03B009F4B30 /* HaishinKit.framework in Frameworks */,
154143
295F9DC21E62BE5400B3569C /* GPUImage.framework in Frameworks */,
155-
295F9DCA1E62C1E800B3569C /* XCGLogger.framework in Frameworks */,
156144
);
157145
runOnlyForDeploymentPostprocessing = 0;
158146
};
@@ -201,8 +189,6 @@
201189
293874D51F35B01E009F4B30 /* HaishinKit.framework */,
202190
295F9DBB1E62BE3E00B3569C /* GPUImage.framework */,
203191
292FA1D21E2A2B3F00F88072 /* GPUImage.framework */,
204-
295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */,
205-
292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */,
206192
);
207193
name = Frameworks;
208194
sourceTree = "<group>";
@@ -462,8 +448,7 @@
462448
inputPaths = (
463449
"$(SRCROOT)/Carthage/Build/iOS/GPUImage.framework",
464450
"$(SRCROOT)/Carthage/Build/iOS/HaishinKit.framework",
465-
"$(SRCROOT)/Carthage/Build/iOS/XCGLogger.framework",
466-
"$(SRCROOT)/Carthage/Build/iOS/ObjcExceptionBridging.framework",
451+
"$(SRCROOT)/Carthage/Build/iOS/Logboard.framework",
467452
);
468453
outputPaths = (
469454
);
@@ -479,8 +464,7 @@
479464
inputPaths = (
480465
"$(SRCROOT)/Carthage/Build/Mac/GPUImage.framework",
481466
"$(SRCROOT)/Carthage/Build/Mac/HaishinKit.framework",
482-
"$(SRCROOT)/Carthage/Build/Mac/XCGLogger.framework",
483-
"$(SRCROOT)/Carthage/Build/Mac/ObjcExceptionBridging.framework",
467+
"$(SRCROOT)/Carthage/Build/Mac/Logboard.framework",
484468
);
485469
outputPaths = (
486470
);

Platforms/iOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.3</string>
18+
<string>1.1.4</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

Platforms/macOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.3</string>
18+
<string>1.1.4</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ source 'https://github.com/CocoaPods/Specs.git'
3333
use_frameworks!
3434

3535
def import_pods
36-
pod 'GPUHaishinKit', '~> 1.1.3'
36+
pod 'GPUHaishinKit', '~> 1.1.4'
3737
end
3838

3939
target 'Your Target' do
@@ -43,7 +43,7 @@ end
4343
```
4444
### Carthage
4545
```
46-
github "shogo4405/GPUHaishinKit.swift" ~> 1.1.3
46+
github "shogo4405/GPUHaishinKit.swift" ~> 1.1.4
4747
```
4848

4949
## License

0 commit comments

Comments
 (0)