Skip to content

Commit

Permalink
Merge branch 'release/2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
0xced committed Sep 15, 2015
2 parents b130281 + 353323f commit 855944f
Show file tree
Hide file tree
Showing 62 changed files with 1,153 additions and 1,114 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
osx_image: xcode6.4
language: objective-c
env:
global:
LC_CTYPE="en_US.UTF-8"
matrix:
- CONFIGURATION="Code Coverage" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s" OBJROOT="build"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=7.1"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=8.1"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=8.2"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=8.3"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=8.4"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 4s" RUN_CLANG_STATIC_ANALYZER="YES"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" DESTINATION="platform=iOS Simulator,name=iPhone 5s" RUN_CLANG_STATIC_ANALYZER="YES"
- CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Framework" DESTINATION="platform=iOS Simulator,name=iPhone 4s" RUN_CLANG_STATIC_ANALYZER="YES"
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#### Version 2.3.0

* Raised deployment target to iOS 7.0 and OS X 10.9.
* Xcode 7 support.
* Nullability annotations.
* Fixed bitcode issue with CocoaPods integration. (#165, #173)

#### Version 2.2.0

* Networking and parsing code is executed on a background thread for better performance. The `XCDYouTubeVideoOperation` class has changed from an asynchronous to a synchronous operation and must not be started on the main thread. (#147)
Expand Down
17 changes: 4 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Are you enjoying XCDYouTubeKit? You can say thank you with [a tweet](https://twi

## Requirements

- Runs on iOS 5.0 and later
- Runs on OS X 10.7 and later
- Runs on iOS 7.0 and later
- Runs on OS X 10.9 and later

## Warning

Expand All @@ -30,12 +30,12 @@ XCDYouTubeKit is available through CocoaPods and Carthage.

CocoaPods:
```ruby
pod "XCDYouTubeKit", "~> 2.2.0"
pod "XCDYouTubeKit", "~> 2.3.0"
```

Carthage:
```objc
github "0xced/XCDYouTubeKit" ~> 2.2.0
github "0xced/XCDYouTubeKit" ~> 2.3.0
```

Alternatively, you can manually use the provided static library on iOS or dynamic framework on OS X. In order to use the iOS static library, you must:
Expand All @@ -47,15 +47,6 @@ Alternatively, you can manually use the provided static library on iOS or dynami

These steps will ensure that `#import <XCDYouTubeKit/XCDYouTubeKit.h>` will work properly in your project.

**Warning**: If you use the iOS static library and you are targeting iOS 7, add the JavaScriptCore framework. If you are targeting iOS 5 or 6, you must add the following *Other Linker Flags* instead to your app:

```
-Wl,-U,_JSContextGetGlobalObject -Wl,-U,_JSEvaluateScript -Wl,-U,_JSGlobalContextCreate -Wl,-U,_JSGlobalContextRelease -Wl,-U,_JSObjectCallAsFunction -Wl,-U,_JSObjectIsFunction -Wl,-U,_JSObjectMake -Wl,-U,_JSObjectSetProperty -Wl,-U,_JSStringCopyCFString -Wl,-U,_JSStringCreateWithCFString -Wl,-U,_JSStringRelease -Wl,-U,_JSValueIsObject -Wl,-U,_JSValueIsString -Wl,-U,_JSValueMakeString -Wl,-U,_JSValueToStringCopy
```

See my [JavaScriptCore framework availability on iOS](http://stackoverflow.com/questions/23514579/javascriptcore-framework-availability-on-ios/23514580#23514580) answer on Stack Overflow for a complete explanation.


## Usage

XCDYouTubeKit is [fully documented](http://cocoadocs.org/docsets/XCDYouTubeKit/).
Expand Down
6 changes: 3 additions & 3 deletions Scripts/analyzer.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python

import os, plistlib, sys
import glob, os, plistlib, sys

run_clang_static_analyzer = os.environ.get('RUN_CLANG_STATIC_ANALYZER', '0').strip(' ')
if not run_clang_static_analyzer[:1] in 'YyTt123456789':
Expand All @@ -11,8 +11,8 @@
sys.exit("error: Static Anaylzer results not found, expected in %s" % analyzer_results_dir)

exit_code = 0
for result in os.listdir(analyzer_results_dir):
with open(os.path.join(analyzer_results_dir, result)) as f:
for result in glob.iglob(os.path.join(analyzer_results_dir, "*.plist")):
with open(result) as f:
plist = plistlib.readPlist(f)
for diagnostic in plist['diagnostics']:
location = diagnostic['location']
Expand Down
4 changes: 3 additions & 1 deletion XCDYouTubeKit Demo/Podfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
xcodeproj 'XCDYouTubeKit Demo.xcodeproj'
workspace '../XCDYouTubeKit Demo.xcworkspace'

inhibit_all_warnings!

def import_pods
pod 'XCDLumberjackNSLogger', '~> 1.0.0'
end

target 'XCDYouTubeKit iOS Demo' do
platform :ios, '5.0'
platform :ios, '7.0'
import_pods
end

Expand Down
20 changes: 10 additions & 10 deletions XCDYouTubeKit Demo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
PODS:
- CocoaLumberjack (2.0.0):
- CocoaLumberjack/Default (= 2.0.0)
- CocoaLumberjack/Extensions (= 2.0.0)
- CocoaLumberjack/Core (2.0.0)
- CocoaLumberjack/Default (2.0.0):
- CocoaLumberjack (2.0.1):
- CocoaLumberjack/Default (= 2.0.1)
- CocoaLumberjack/Extensions (= 2.0.1)
- CocoaLumberjack/Core (2.0.1)
- CocoaLumberjack/Default (2.0.1):
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.0.0):
- CocoaLumberjack/Extensions (2.0.1):
- CocoaLumberjack/Default
- NSLogger (1.5.1):
- NSLogger/Standard (= 1.5.1)
- NSLogger/Standard (1.5.1)
- XCDLumberjackNSLogger (1.0.0):
- XCDLumberjackNSLogger (1.0.1):
- CocoaLumberjack (~> 2.0.0)
- NSLogger (~> 1.5.1)

DEPENDENCIES:
- XCDLumberjackNSLogger (~> 1.0.0)

SPEC CHECKSUMS:
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
CocoaLumberjack: 019d1361244274a6138c788c6cb80baabc13fb8f
NSLogger: 5ed223a2436df96244e033be750656dacdeec034
XCDLumberjackNSLogger: 499dd507ac73e41b63b600b3280b9920e35f53c6
XCDLumberjackNSLogger: 867392d7b40490e1b15aac9c1acee0952bf33d61

COCOAPODS: 0.37.2
COCOAPODS: 0.38.2

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 25 additions & 22 deletions XCDYouTubeKit Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions XCDYouTubeKit Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 855944f

Please sign in to comment.