Skip to content

Commit

Permalink
fixes Carthage build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
markpokornycos committed Dec 5, 2017
1 parent dde751a commit 19a0c7f
Show file tree
Hide file tree
Showing 30 changed files with 1,021 additions and 859 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ DerivedData

# Vim files
*.swp
/Carthage
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the LaunchDarkly iOS SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).

## [2.9.1] - 2017-12-05
### Fixed
- Carthage builds no longer crash due to a missing DarklyEventSource library.

## [2.9.0] - 2017-11-29
### Changed
- `LDClientManager` no longer extends `UIApplicationDelegate`. The framework is now marked as extension-safe. Thanks @atlassian-gaustin!
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "launchdarkly/ios-eventsource" ~> 3.1.1
github "launchdarkly/ios-eventsource"
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "launchdarkly/ios-eventsource" "3.1.2"
264 changes: 162 additions & 102 deletions Darkly.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Darkly/DarklyConstants.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#import "DarklyConstants.h"

NSString * const kClientVersion = @"2.9.0";
NSString * const kClientVersion = @"2.9.1";
NSString * const kBaseUrl = @"https://app.launchdarkly.com";
NSString * const kEventsUrl = @"https://mobile.launchdarkly.com";
NSString * const kStreamUrl = @"https://clientstream.launchdarkly.com/mping";
Expand Down
2 changes: 1 addition & 1 deletion Darkly/LDClientManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "LDEventModel.h"
#import "LDFlagConfigModel.h"
#import "NSDictionary+JSON.h"
#import "LDEventSource.h"
#import <DarklyEventSource/LDEventSource.h>
#import "LDEvent+Unauthorized.h"

@interface LDClientManager()
Expand Down
6 changes: 3 additions & 3 deletions LaunchDarkly.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "LaunchDarkly"
s.version = "2.9.0"
s.version = "2.9.1"
s.summary = "iOS SDK for LaunchDarkly"

s.description = <<-DESC
Expand All @@ -23,13 +23,13 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = "9.0"
s.osx.deployment_target = '10.10'

s.source = { :git => "https://github.com/launchdarkly/ios-client.git", :tag => "2.9.0" }
s.source = { :git => "https://github.com/launchdarkly/ios-client.git", :tag => "2.9.1" }

s.source_files = "Darkly/*.{h,m}"

s.requires_arc = true

s.subspec 'Core' do |eventSource|
eventSource.dependency 'DarklyEventSource', '~> 3.1.1'
eventSource.dependency 'DarklyEventSource'
end
end
8 changes: 4 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
use_frameworks!
target 'Darkly_iOS' do
platform :ios, '8.0'
pod 'DarklyEventSource', '~> 3.1.1'
pod 'DarklyEventSource'
end

target 'Darkly_tvOS' do
platform :tvos, '9.0'
pod 'DarklyEventSource', '~> 3.1.1'
pod 'DarklyEventSource'
end

target 'Darkly_watchOS' do
platform :watchos, '2.0'
pod 'DarklyEventSource', '~> 3.1.1'
pod 'DarklyEventSource'
end

target 'Darkly_osx' do
platform :osx, '10.10'
pod 'DarklyEventSource', '~> 3.1.1'
pod 'DarklyEventSource'
end

target 'DarklyTests' do
Expand Down
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- DarklyEventSource (3.1.1)
- OCMock (3.4)
- DarklyEventSource (3.1.2)
- OCMock (3.4.1)
- OHHTTPStubs (4.8.0):
- OHHTTPStubs/Default (= 4.8.0)
- OHHTTPStubs/Core (4.8.0)
Expand All @@ -16,15 +16,15 @@ PODS:
- OHHTTPStubs/OHPathHelpers (4.8.0)

DEPENDENCIES:
- DarklyEventSource (~> 3.1.1)
- DarklyEventSource
- OCMock (~> 3.1)
- OHHTTPStubs (~> 4.2)

SPEC CHECKSUMS:
DarklyEventSource: 28b49dd587df166d3fd09aeb45e60671b6ae583c
OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
DarklyEventSource: 701c8e651e792ad2d74b98aae6a85234d810b73f
OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
OHHTTPStubs: b393565822317305b87a1440d4c7aff131679f66

PODFILE CHECKSUM: 5b458b9711c6f582912af813a0a7dd5614777ee4
PODFILE CHECKSUM: 067a3f5c83c580423c3f8ae10d4ab6f2b7025306

COCOAPODS: 1.3.1
11 changes: 11 additions & 0 deletions Pods/DarklyEventSource/LDEventSource/DarklyEventSource.h

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

4 changes: 2 additions & 2 deletions Pods/DarklyEventSource/README.md

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

6 changes: 3 additions & 3 deletions Pods/Local Podspecs/DarklyEventSource.podspec.json

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

12 changes: 6 additions & 6 deletions Pods/Manifest.lock

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

13 changes: 12 additions & 1 deletion Pods/OCMock/Source/OCMock/NSInvocation+OCMAdditions.m

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

6 changes: 4 additions & 2 deletions Pods/OCMock/Source/OCMock/OCClassMockObject.m

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

Loading

0 comments on commit 19a0c7f

Please sign in to comment.