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

Commit

Permalink
Bump up HaishinKit to 0.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo4405 committed Aug 12, 2017
1 parent 147a743 commit e165b40
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "shogo4405/HaishinKit.swift" ~> 0.7.3
github "shogo4405/HaishinKit.swift" ~> 0.7.4
github "BradLarson/GPUImage"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "BradLarson/GPUImage" "0.1.7"
github "DaveWoodCom/XCGLogger" "5.0.1"
github "shogo4405/HaishinKit.swift" "0.7.3"
github "shogo4405/HaishinKit.swift" "0.7.4"
github "shogo4405/Logboard" "1.0.1"
8 changes: 4 additions & 4 deletions GPUHaishinKit.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|

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

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

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

s.source_files = "Sources/**/*.swift"
s.dependency 'GPUImage', '~> 0.1.7'
s.dependency 'HaishinKit', '~> 0.7.3'
s.dependency 'HaishinKit', '~> 0.7.4'

end
20 changes: 2 additions & 18 deletions GPUHaishinKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
292FA1D71E2A2B3F00F88072 /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */; };
293874D61F35B01E009F4B30 /* HaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 293874D51F35B01E009F4B30 /* HaishinKit.framework */; };
293874D81F35B03B009F4B30 /* HaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 293874D71F35B03B009F4B30 /* HaishinKit.framework */; };
295747841E351C2B00EF056E /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */; };
295747861E3520D800EF056E /* GPUHaishinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */; };
2957478A1E35222E00EF056E /* GPUHaishinKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
295F9D791E62B4CA00B3569C /* GPUHaishinKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9D711E62B4CA00B3569C /* GPUHaishinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand All @@ -29,11 +27,8 @@
295F9DC11E62BE4900B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D21E2A2B3F00F88072 /* GPUImage.framework */; };
295F9DC21E62BE5400B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; };
295F9DC51E62BE6600B3569C /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292FA1D21E2A2B3F00F88072 /* GPUImage.framework */; };
295F9DCA1E62C1E800B3569C /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; };
298A74841E62D0A200870DBA /* GPUImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
298A74881E62D0A200870DBA /* XCGLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
298A74891E62D0F100870DBA /* GPUImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBB1E62BE3E00B3569C /* GPUImage.framework */; };
298A748B1E62D0F100870DBA /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */; };
298A748C1E62D10900870DBA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 295F9DB61E62BAF700B3569C /* Main.storyboard */; };
298A74901E62DBAE00870DBA /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 298A748D1E62DBAE00870DBA /* Cartfile */; };
298A74911E62DBAE00870DBA /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 298A748E1E62DBAE00870DBA /* LICENSE */; };
Expand Down Expand Up @@ -75,7 +70,6 @@
dstSubfolderSpec = 10;
files = (
295F9D791E62B4CA00B3569C /* GPUHaishinKit.framework in Embed Frameworks */,
298A74881E62D0A200870DBA /* XCGLogger.framework in Embed Frameworks */,
298A74841E62D0A200870DBA /* GPUImage.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
Expand All @@ -86,7 +80,6 @@
/* Begin PBXFileReference section */
292FA1C61E2A200D00F88072 /* GPUHaishinKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GPUHaishinKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
292FA1D21E2A2B3F00F88072 /* GPUImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GPUImage.framework; path = Carthage/Build/iOS/GPUImage.framework; sourceTree = "<group>"; };
292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCGLogger.framework; path = Carthage/Build/iOS/XCGLogger.framework; sourceTree = "<group>"; };
293874D51F35B01E009F4B30 /* HaishinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HaishinKit.framework; path = Carthage/Build/iOS/HaishinKit.framework; sourceTree = "<group>"; };
293874D71F35B03B009F4B30 /* HaishinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HaishinKit.framework; path = Carthage/Build/Mac/HaishinKit.framework; sourceTree = "<group>"; };
295747701E351B1800EF056E /* Example-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -110,7 +103,6 @@
295F9DB11E62BA9500B3569C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Examples/iOS/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
295F9DB71E62BAF700B3569C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Examples/macOS/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
295F9DBB1E62BE3E00B3569C /* GPUImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GPUImage.framework; path = Carthage/Build/Mac/GPUImage.framework; sourceTree = "<group>"; };
295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCGLogger.framework; path = Carthage/Build/Mac/XCGLogger.framework; sourceTree = "<group>"; };
298A748D1E62DBAE00870DBA /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
298A748E1E62DBAE00870DBA /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
298A748F1E62DBAE00870DBA /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
Expand All @@ -122,7 +114,6 @@
buildActionMask = 2147483647;
files = (
293874D61F35B01E009F4B30 /* HaishinKit.framework in Frameworks */,
292FA1D71E2A2B3F00F88072 /* XCGLogger.framework in Frameworks */,
295F9DC11E62BE4900B3569C /* GPUImage.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -132,7 +123,6 @@
buildActionMask = 2147483647;
files = (
295F9DC51E62BE6600B3569C /* GPUImage.framework in Frameworks */,
295747841E351C2B00EF056E /* XCGLogger.framework in Frameworks */,
295747861E3520D800EF056E /* GPUHaishinKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -142,7 +132,6 @@
buildActionMask = 2147483647;
files = (
298A74891E62D0F100870DBA /* GPUImage.framework in Frameworks */,
298A748B1E62D0F100870DBA /* XCGLogger.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -152,7 +141,6 @@
files = (
293874D81F35B03B009F4B30 /* HaishinKit.framework in Frameworks */,
295F9DC21E62BE5400B3569C /* GPUImage.framework in Frameworks */,
295F9DCA1E62C1E800B3569C /* XCGLogger.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -201,8 +189,6 @@
293874D51F35B01E009F4B30 /* HaishinKit.framework */,
295F9DBB1E62BE3E00B3569C /* GPUImage.framework */,
292FA1D21E2A2B3F00F88072 /* GPUImage.framework */,
295F9DBD1E62BE3E00B3569C /* XCGLogger.framework */,
292FA1D41E2A2B3F00F88072 /* XCGLogger.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -462,8 +448,7 @@
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/GPUImage.framework",
"$(SRCROOT)/Carthage/Build/iOS/HaishinKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/XCGLogger.framework",
"$(SRCROOT)/Carthage/Build/iOS/ObjcExceptionBridging.framework",
"$(SRCROOT)/Carthage/Build/iOS/Logboard.framework",
);
outputPaths = (
);
Expand All @@ -479,8 +464,7 @@
inputPaths = (
"$(SRCROOT)/Carthage/Build/Mac/GPUImage.framework",
"$(SRCROOT)/Carthage/Build/Mac/HaishinKit.framework",
"$(SRCROOT)/Carthage/Build/Mac/XCGLogger.framework",
"$(SRCROOT)/Carthage/Build/Mac/ObjcExceptionBridging.framework",
"$(SRCROOT)/Carthage/Build/Mac/Logboard.framework",
);
outputPaths = (
);
Expand Down
2 changes: 1 addition & 1 deletion Platforms/iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.3</string>
<string>1.1.4</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/macOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.3</string>
<string>1.1.4</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

def import_pods
pod 'GPUHaishinKit', '~> 1.1.3'
pod 'GPUHaishinKit', '~> 1.1.4'
end

target 'Your Target' do
Expand All @@ -43,7 +43,7 @@ end
```
### Carthage
```
github "shogo4405/GPUHaishinKit.swift" ~> 1.1.3
github "shogo4405/GPUHaishinKit.swift" ~> 1.1.4
```

## License
Expand Down

0 comments on commit e165b40

Please sign in to comment.