Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# config file version: 1.0.3
# config file version: 1.1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this jump a minor version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we added steps to build all targets

version: 2
jobs:
build:
Expand Down Expand Up @@ -46,8 +46,20 @@ jobs:
command: instruments -s devices

- run:
name: Clean, Build, & Test
command: set -o pipefail && xcodebuild clean build test -workspace 'Darkly.xcworkspace' -scheme 'Darkly_iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= | tee 'xcode_raw.log' | xcpretty --color --report html --output '/Users/distiller/launchdarkly/ios-client/tmp/output/report.html' --report junit --output '/Users/distiller/launchdarkly/ios-client/tmp/output/xcode/report.junit'
name: Clean, Build, & Test Darkly_iOS
command: set -o pipefail && xcodebuild clean build test -workspace 'Darkly.xcworkspace' -scheme 'Darkly_iOS' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone XS,OS=latest' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= | tee 'Darkly_iOS_xcode_raw.log' | xcpretty --color --report html --output '/Users/distiller/launchdarkly/ios-client/tmp/output/report.html' --report junit --output '/Users/distiller/launchdarkly/ios-client/tmp/output/xcode/report.junit'

- run:
name: Clean & Build Darkly_watchOS
command: set -o pipefail && xcodebuild clean build -workspace 'Darkly.xcworkspace' -scheme 'Darkly_watchOS' -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm,OS=latest' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= | tee 'Darkly_watchOS_xcode_raw.log' | xcpretty --color

- run:
name: Clean & Build Darkly_macOS
command: set -o pipefail && xcodebuild clean build -workspace 'Darkly.xcworkspace' -scheme 'Darkly_macOS' -sdk macosx10.14 -destination 'platform=macOS' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= | tee 'Darkly_macOS_xcode_raw.log' | xcpretty --color

- run:
name: Clean & Build Darkly_tvOS
command: set -o pipefail && xcodebuild clean build -workspace 'Darkly.xcworkspace' -scheme 'Darkly_tvOS' -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV,OS=latest' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= | tee 'Darkly_tvOS_xcode_raw.log' | xcpretty --color

- run:
name: CocoaPods lib lint
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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

## [2.14.4] - 2019-02-26
### Changed
- Changed the following to repair macOS builds:
- Removed extraneous framework reference from Darkly_macOS target
- Deselected `Autocreate schemes` in Darkly.xcworkspace

## [2.14.3] - 2019-02-25
### Changed
- Added support for integrating without a package manager
Expand Down
2 changes: 0 additions & 2 deletions Darkly.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@
83F5B47D1F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m in Sources */ = {isa = PBXBuildFile; fileRef = 83F5B4771F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m */; };
83F5B47E1F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m in Sources */ = {isa = PBXBuildFile; fileRef = 83F5B4771F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m */; };
83F5B47F1F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m in Sources */ = {isa = PBXBuildFile; fileRef = 83F5B4771F95096A00174DF7 /* NSHTTPURLResponse+LaunchDarkly.m */; };
8DE0698D3B7DEA19384C3A9F /* Pods_Darkly_osx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 341AAE85536E2475F72AE06E /* Pods_Darkly_osx.framework */; };
DE785F81273AE3E88DB375AF /* Pods_DarklyTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFBD030F4970228B05E70E20 /* Pods_DarklyTests.framework */; };
ECA1CC85235BCF3622CBF81A /* Pods_Darkly_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E899F5F16EA49C1554A53E3 /* Pods_Darkly_iOS.framework */; };
F2A2FB2DE45DE3788D322D2C /* Pods_Darkly_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 016D29F6ACAADE0EB7D88703 /* Pods_Darkly_macOS.framework */; };
Expand Down Expand Up @@ -654,7 +653,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8DE0698D3B7DEA19384C3A9F /* Pods_Darkly_osx.framework in Frameworks */,
F2A2FB2DE45DE3788D322D2C /* Pods_Darkly_macOS.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<true/>
<false/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this the fix for the schemes issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in part. this prevents CocoaPods from creating schemes, which then cannot become public

</dict>
</plist>
2 changes: 1 addition & 1 deletion Darkly/DataModels/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.14.3";
NSString * const kClientVersion = @"2.14.4";
NSString * const kLDPrimaryEnvironmentName = @"LaunchDarkly.EnvironmentName.Primary";
NSString * const kBaseUrl = @"https://app.launchdarkly.com";
NSString * const kEventsUrl = @"https://mobile.launchdarkly.com";
Expand Down
4 changes: 2 additions & 2 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.14.3"
s.version = "2.14.4"
s.summary = "iOS SDK for LaunchDarkly"

s.description = <<-DESC
Expand All @@ -23,7 +23,7 @@ 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.14.3" }
s.source = { :git => "https://github.com/launchdarkly/ios-client.git", :tag => "2.14.4" }

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

Expand Down
26 changes: 0 additions & 26 deletions Pods/Target Support Files/DarklyEventSource-iOS/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/DarklyEventSource-macOS/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/DarklyEventSource-tvOS/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/DarklyEventSource-watchOS/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/OCMock/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/OHHTTPStubs/Info.plist

This file was deleted.

26 changes: 0 additions & 26 deletions Pods/Target Support Files/Pods-DarklyTests/Info.plist

This file was deleted.

This file was deleted.

Loading