Skip to content

Commit

Permalink
Merge branch 'develop' into idempotent-rest-publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
ricardopereira committed Jan 4, 2019
2 parents 69aa358 + c67eabb commit dfd79c1
Show file tree
Hide file tree
Showing 79 changed files with 2,719 additions and 393 deletions.
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode10
osx_image: xcode10.1
env:
global:
- LC_CTYPE=en_US.UTF-8
Expand All @@ -10,20 +10,22 @@ matrix:
- env: NAME="ably-iOS" LANE=test_iOS11
- env: NAME="ably-iOS" LANE=test_iOS10
- env: NAME="ably-iOS" LANE=test_iOS9
before_install:
- gem install cocoapods -v '1.5.3'
- pod repo update > /dev/null
- env: NAME="ably-tvOS" LANE=test_tvOS12
- env: NAME="ably-macOS" LANE=test_macOS
install:
# CocoaPods
- pod install
# Carthage
- carthage bootstrap --platform iOS
- if [[ ${NAME} == "ably-iOS" ]]; then carthage update --platform iOS --cache-builds; fi
- if [[ ${NAME} == "ably-tvOS" ]]; then carthage update --platform tvOS --cache-builds; fi
- if [[ ${NAME} == "ably-macOS" ]]; then carthage update --platform macOS --cache-builds; fi
# Update fastlane
- gem install fastlane -v '2.100.1'
- gem install fastlane -v '2.108.0'
before_script:
- xcrun simctl erase all
script:
- export ABLY_ENV="idempotent-dev"
- fastlane $LANE
after_success:
- sleep 5
cache:
directories:
- Carthage
12 changes: 6 additions & 6 deletions Ably.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
s.version = `Scripts/get-version.sh`
s.summary = "iOS client for Ably"
s.description = <<-DESC
iOS client library for ably.io, the realtime messaging service, written in Objective-C and ready for Swift 3.0.
iOS client library for ably.io, the realtime messaging service, written in Objective-C and ready for Swift 4.0 and later.
DESC
s.homepage = "https://www.ably.io"
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
Expand All @@ -14,12 +14,12 @@ Pod::Spec.new do |s|
s.platform = :ios, '8.0'
s.requires_arc = true
s.swift_version = '4.2'
s.source_files = 'Source/*.{h,m}'
s.private_header_files = 'Source/*+Private.h'
s.source_files = 'Source/**/*.{h,m}'
s.private_header_files = 'Source/*+Private.h', 'Source/Private/*.h'
s.module_map = 'Source/Ably.modulemap'
s.dependency 'SocketRocketAblyFork', '0.5.2-ably-2'
s.dependency 'msgpack', '0.1.8'
s.dependency 'KSCrashAblyFork', '1.15.8-ably-2'
s.dependency 'ULID', '1.0.2'
s.dependency 'MsgPackAblyFork', '0.2.0-ably-1'
s.dependency 'KSCrashAblyFork', '1.15.18-ably-1'
s.dependency 'ULID', '1.0.4'
s.dependency 'SAMKeychain', '1.5.3'
end
1 change: 1 addition & 0 deletions Ably.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include? "Version.xcconfig"
1,690 changes: 1,576 additions & 114 deletions Ably.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "856AAC891B6E304B00B07119"
BuildableName = "AblySpec.xctest"
BlueprintName = "AblySpec"
BuildableName = "Ably-iOS-Tests.xctest"
BlueprintName = "Ably-iOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -33,8 +33,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "856AAC891B6E304B00B07119"
BuildableName = "AblySpec.xctest"
BlueprintName = "AblySpec"
BuildableName = "Ably-iOS-Tests.xctest"
BlueprintName = "Ably-iOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</TestableReference>
Expand Down Expand Up @@ -63,8 +63,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "856AAC891B6E304B00B07119"
BuildableName = "AblySpec.xctest"
BlueprintName = "AblySpec"
BuildableName = "Ably-iOS-Tests.xctest"
BlueprintName = "Ably-iOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -81,8 +81,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "856AAC891B6E304B00B07119"
BuildableName = "AblySpec.xctest"
BlueprintName = "AblySpec"
BuildableName = "Ably-iOS-Tests.xctest"
BlueprintName = "Ably-iOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
BuildableName = "Ably.framework"
BlueprintName = "Ably"
BlueprintName = "Ably-iOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -33,8 +33,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "856AAC891B6E304B00B07119"
BuildableName = "AblySpec.xctest"
BlueprintName = "AblySpec"
BuildableName = "Ably-iOS-Tests.xctest"
BlueprintName = "Ably-iOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</TestableReference>
Expand All @@ -44,7 +44,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
BuildableName = "Ably.framework"
BlueprintName = "Ably"
BlueprintName = "Ably-iOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down Expand Up @@ -73,7 +73,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
BuildableName = "Ably.framework"
BlueprintName = "Ably"
BlueprintName = "Ably-iOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -91,7 +91,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
BuildableName = "Ably.framework"
BlueprintName = "Ably"
BlueprintName = "Ably-iOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
90 changes: 90 additions & 0 deletions Ably.xcodeproj/xcshareddata/xcschemes/Ably-macOS-Tests.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D7093C09219E2DB200723F17"
BuildableName = "Ably-macOS-Tests.xctest"
BlueprintName = "Ably-macOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D7093C09219E2DB200723F17"
BuildableName = "Ably-macOS-Tests.xctest"
BlueprintName = "Ably-macOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D7093C09219E2DB200723F17"
BuildableName = "Ably-macOS-Tests.xctest"
BlueprintName = "Ably-macOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D7093C09219E2DB200723F17"
BuildableName = "Ably-macOS-Tests.xctest"
BlueprintName = "Ably-macOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
99 changes: 99 additions & 0 deletions Ably.xcodeproj/xcshareddata/xcschemes/Ably-macOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D710D45A219495E2008F54AD"
BuildableName = "Ably.framework"
BlueprintName = "Ably-macOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D7093C09219E2DB200723F17"
BuildableName = "Ably-macOS-Tests.xctest"
BlueprintName = "Ably-macOS-Tests"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D710D45A219495E2008F54AD"
BuildableName = "Ably.framework"
BlueprintName = "Ably-macOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D710D45A219495E2008F54AD"
BuildableName = "Ably.framework"
BlueprintName = "Ably-macOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D710D45A219495E2008F54AD"
BuildableName = "Ably.framework"
BlueprintName = "Ably-macOS"
ReferencedContainer = "container:Ably.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit dfd79c1

Please sign in to comment.