Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/no-connection…
Browse files Browse the repository at this point in the history
…-serial

# Conflicts:
#	Test/Test Utilities/TestUtilities.swift
#	Test/Tests/ARTDefaultTests.swift
#	Test/Tests/RealtimeClientPresenceTests.swift
  • Loading branch information
maratal committed Nov 26, 2023
2 parents a444179 + df914e1 commit d7538fa
Show file tree
Hide file tree
Showing 53 changed files with 967 additions and 143 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/carthage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Carthage Installation

on:
pull_request:
push:
branches:
- main

jobs:
check:
runs-on: macos-latest

env:
LC_CTYPE: en_US.UTF-8
LANG: en_US.UTF-8
ABLY_ENV: sandbox

steps:
- name: Check out SDK repo
uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
echo "Selected Xcode version:"
xcodebuild -version
- name: Log environment information
run: ./Scripts/log-environment-information.sh

- name: Reset Simulators
run: xcrun simctl erase all

- name: Carthage - Installation Test
working-directory: ./Examples/AblyCarthage
run: |
echo 'Installing Carthage dependencies...'
carthage update --use-xcframeworks --platform iOS --no-use-binaries
echo 'Building AblyCarthage example...'
xcodebuild build -scheme "AblyCarthage" -destination "platform=iOS Simulator,name=iPhone 14" -configuration "Debug"
2 changes: 2 additions & 0 deletions Ably.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3899,6 +3899,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "Test/AblyTests-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Ably_Tests-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand Down Expand Up @@ -3965,6 +3966,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "Test/AblyTests-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Ably_Tests-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.1;
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## [1.2.23](https://github.com/ably/ably-cocoa/tree/1.2.23)

[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.22...1.2.23)

**Fixed issues:**

- Push device deregistration does not clear device details. [\#1177](https://github.com/ably/ably-cocoa/issues/1177)
- App build fails due to missing dependencies. [\#1755](https://github.com/ably/ably-cocoa/issues/1755) and [\#1824](https://github.com/ably/ably-cocoa/issues/1824)

## [1.2.22](https://github.com/ably/ably-cocoa/tree/1.2.22)

[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.21...1.2.22)
Expand Down
Loading

0 comments on commit d7538fa

Please sign in to comment.