Skip to content

Commit

Permalink
bumped depdendencies up to 4.0.0-rc.1, ready for ng release. Up to da…
Browse files Browse the repository at this point in the history
…te with UIKit v1.8.4
  • Loading branch information
maxxfrazer committed Aug 18, 2022
2 parents c45bbd0 + 1e31b8c commit 094f5ed
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .AgoraRtmControl_macOS.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'AgoraRtmControl_macOS'
s.module_name = 'AgoraRtmControl'
s.version = ENV['LIB_VERSION'] || '1.8.2'
s.version = ENV['LIB_VERSION'] || '1.8.4'
s.summary = 'Agora Real-time Messaging Wrapper.'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion .AgoraUIKit_macOS.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'AgoraUIKit_macOS'
s.module_name = 'AgoraUIKit'
s.version = ENV['LIB_VERSION'] || '1.8.2'
s.version = ENV['LIB_VERSION'] || '1.8.4'
s.summary = 'Agora video session AppKit template.'

s.description = <<-DESC
Expand Down
5 changes: 5 additions & 0 deletions .spi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: 1
builder:
configs:
- platform: ios
documentation_targets: [AgoraUIKit]
2 changes: 1 addition & 1 deletion AgoraRtmControl_iOS.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'AgoraRtmControl_iOS'
s.module_name = 'AgoraRtmControl'
s.version = ENV['LIB_VERSION'] || '4.0.0-preview.14'
s.version = ENV['LIB_VERSION'] || '4.0.0-rc.1'
s.summary = 'Agora Real-time Messaging Wrapper.'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion AgoraUIKit_iOS.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'AgoraUIKit_iOS'
s.module_name = 'AgoraUIKit'
s.version = ENV['LIB_VERSION'] || '4.0.0-preview.14'
s.version = ENV['LIB_VERSION'] || '4.0.0-rc.1'
s.summary = 'Agora video session UIKit template.'

s.description = <<-DESC
Expand Down
7 changes: 3 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.4
// swift-tools-version:5.5
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -14,9 +14,8 @@ let package = Package(
dependencies: [
.package(
name: "AgoraRtcKit",
url: "https://github.com/agorabuilder/AgoraRtcEngine_iOS_Preview",
.exact("4.0.0-preview.3")
// .upToNextMajor(from: .init(4, 0, 0, prereleaseIdentifiers: ["-preview"], buildMetadataIdentifiers: []))
url: "https://github.com/AgoraIO/AgoraRtcEngine_iOS",
.upToNextMajor(from: .init(4, 0, 0, prereleaseIdentifiers: ["-beta"], buildMetadataIdentifiers: []))
),
.package(
name: "AgoraRtmKit",
Expand Down
2 changes: 1 addition & 1 deletion Sources/Agora-UIKit/AgoraCollectionViewer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import AppKit
public class AgoraCollectionViewer: MPCollectionView {

static let cellSpacing: CGFloat = 5
static var flowLayout: MPCollectionViewFlowLayout {
public static var flowLayout: MPCollectionViewFlowLayout {
let flowLayout = MPCollectionViewFlowLayout()
flowLayout.itemSize = CGSize(width: 100, height: 100)
flowLayout.scrollDirection = .horizontal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ extension AgoraVideoViewer {
get { self.connectionData }
set { self.connectionData = newValue }
}
/// AgoraRtcEngineKit being used by this AgoraVideoViewer.
public var rtcEngine: AgoraRtcEngineKit { self.agkit }
/// Property used to access all the RTC connections to other broadcasters in an RTC channel.
public var videoLookup: [UInt: AgoraSingleVideoView] { self.userVideoLookup }

}
Expand Down Expand Up @@ -165,6 +167,9 @@ extension AgoraVideoViewer: RtmControllerDelegate {
public func channel(_ channel: AgoraRtmChannel, memberJoined member: AgoraRtmMember) {
self.sendPersonalData(to: member.userId)
}

/// The local user's ``UserData`` object.
/// - Returns: ``UserData`` object of the local user.
public func personalData() -> some Codable {
let safeRtcId = AgoraUIKit.uintToInt(self.rtcId ?? 0)
return UserData(
Expand Down
2 changes: 1 addition & 1 deletion Sources/Agora-UIKit/AgoraUIKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public struct AgoraUIKit: Codable {
/// Framework type of UIKit. "native", "flutter", "reactnative"
fileprivate(set) var framework: String
/// Version of UIKit being used
static let version = "4.0.0-preview.14"
static let version = "4.0.0-rc.1"
/// Framework type of UIKit. "native", "flutter", "reactnative"
static let framework = "native"
#if os(iOS)
Expand Down
2 changes: 2 additions & 0 deletions Sources/Agora-UIKit/AgoraVideoViewer+VideoControl.swift
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ extension AgoraVideoViewer {
}
}

/// Initialise RTM within Agora UIKit.
/// - Parameter callback: Return the rtm controller as a callback parameter.
open func setupRtmController(callback: ((AgoraRtmController?) -> Void)? = nil) {
if !self.agoraSettings.rtmEnabled { return }
if self.rtmController == nil {
Expand Down
25 changes: 25 additions & 0 deletions Sources/Agora-UIKit/Documentation.docc/AgoraUIKit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# ``AgoraUIKit``

Integrate Agora Video Calling or Live Video Streaming to your iOS or macOS app with just a few lines of code.

## Overview

Agora UIKit is a low-code solution to adding video calls and live streams into your application.

Get started with this package by creating an ``AgoraVideoViewer`` and joining a channel:

```swift
import AgoraRtcKit
import AgoraUIKit

let agoraView = AgoraVideoViewer(
connectionData: AgoraConnectionData(
appId: "<#my-app-id#>",
rtcToken: "<#my-channel-token#>",
rtmToken: "<#my-channel-rtm-token#>"
), delegate: self
)

agoraView.join(channel: "test", as: .broadcaster)

```
7 changes: 7 additions & 0 deletions Sources/AgoraRtmControl/Documentation.docc/AgoraRtmControl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# ``AgoraRtmControl``

AgoraRtmControl is a light wrapper around the Agora RTM.

## Overview

This wrapper keeps track of active channels and other users in the same channel as you.

0 comments on commit 094f5ed

Please sign in to comment.