-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #68 from AgoraIO-Community/rtm-separate
Version 1.8.0 - RTM Changes - compatible with React Native and others. - This update changes messages to be sent as regular messages, rather than RtmRawMessage types. - Pod and Swift Package now have separate packages, RtmControl can be independent of AgoraUIKit. - New import statements, use `import AgoraUIKit` for iOS and macOS. - Bumped native RTC and RTM SDKs to 3.7.0 and 1.4.10 respectively. - The RTM package can be included in your project without Agora UIKit. Fixes: - Fix issue where re-joining member's video feed would not render. - Fix issue where RTM messages are different from Agora UIKit React Native.
- Loading branch information
Showing
48 changed files
with
2,078 additions
and
697 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # iOS UIKit Git Hooks | ||
|
|
||
| To apply these hooks: | ||
|
|
||
| ```sh | ||
| git config --local core.hooksPath .githooks/ | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| #!/bin/zsh | ||
|
|
||
| # An example hook script to verify what is about to be pushed. Called by "git | ||
| # push" after it has checked the remote status, but before anything has been | ||
| # pushed. If this script exits with a non-zero status nothing will be pushed. | ||
| # | ||
| # This hook is called with the following parameters: | ||
| # | ||
| # $1 -- Name of the remote to which the push is being done | ||
| # $2 -- URL to which the push is being done | ||
| # | ||
| # If pushing without using a named remote those arguments will be equal. | ||
| # | ||
| # Information about the commits which are being pushed is supplied as lines to | ||
| # the standard input in the form: | ||
| # | ||
| # <local ref> <local oid> <remote ref> <remote oid> | ||
| # | ||
| # This sample shows how to prevent push of commits where the log message starts | ||
| # with "WIP" (work in progress). | ||
|
|
||
| remote="$1" | ||
| url="$2" | ||
|
|
||
| zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') | ||
|
|
||
| while read local_ref local_oid remote_ref remote_oid | ||
| do | ||
| VRSN=$(grep 'static let version' Sources/Agora-UIKit/AgoraUIKit.swift | sed -e 's,.*\"\(.*\)\",\1,') | ||
| pat="ref.+tags.+[0-9]+\.[0-9]+\.[0-9]+.*" | ||
| if [[ $local_ref =~ $pat ]]; then | ||
| TAG_VERSION=$(echo $local_ref | sed -e 's/refs\/tags\///g') | ||
| if [ "$TAG_VERSION" != "$VRSN" ]; then | ||
| echo "Invalid tag ${TAG_VERSION}, not matching AgoraUIKit.swift: ${VRSN}" | ||
| exit 1 | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: deploy_to_cocoapods | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - '*' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: macOS-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Install Cocoapods | ||
| run: gem install cocoapods | ||
|
|
||
| - name: Deploy to Cocoapods | ||
| env: | ||
| COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} | ||
| run: | | ||
| set -eo pipefail | ||
| export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`) | ||
| export VRSN=$(grep 'static let version' Sources/Agora-UIKit/AgoraUIKit.swift | sed -e 's,.*\"\(.*\)\",\1,') | ||
| if [ "$LIB_VERSION" != "$VRSN" ]; then | ||
| exit 1 | ||
| fi | ||
| pod trunk push AgoraRtmControl_macOS.podspec --allow-warnings --skip-import-validation; | ||
| pod trunk push AgoraRtmControl_iOS.podspec --allow-warnings --skip-import-validation; | ||
| pod trunk push AgoraUIKit_macOS.podspec --allow-warnings --skip-import-validation --synchronous; | ||
| pod trunk push AgoraUIKit_iOS.podspec --allow-warnings --skip-import-validation --synchronous; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: swiftlint | ||
| name: Swiftlint | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -9,11 +9,11 @@ on: | |
| - "*" | ||
|
|
||
| jobs: | ||
| build: | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - name: GitHub Action for SwiftLint | ||
| uses: norio-nomura/[email protected] | ||
| with: | ||
| args: --strict | ||
| - uses: actions/checkout@v3 | ||
| - name: GitHub Action for SwiftLint | ||
| uses: norio-nomura/[email protected] | ||
| with: | ||
| args: --strict | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| // | ||
|
|
||
| import Cocoa | ||
| import AgoraUIKit_macOS | ||
| import AgoraUIKit | ||
|
|
||
| class ViewController: NSViewController { | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| # Uncomment the next line to define a global platform for your project | ||
| platform :macos, '10.14' | ||
| platform :macos, '10.15' | ||
|
|
||
| target 'Agora-AppKit-Example' do | ||
| # Comment the next line if you don't want to use dynamic frameworks | ||
| use_frameworks! | ||
|
|
||
| # Pods for Agora-UIKit-Example | ||
| pod 'AgoraRtmControl_macOS', :path => '../' | ||
| pod 'AgoraUIKit_macOS', :path => '../' | ||
|
|
||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Uncomment the next line to define a global platform for your project | ||
| # platform :ios, '9.0' | ||
|
|
||
| target 'Agora-UIKit-Example' do | ||
| # Comment the next line if you don't want to use dynamic frameworks | ||
| use_frameworks! | ||
|
|
||
| # Pods for Agora-UIKit-Example | ||
| pod 'AgoraUIKit_iOS', :path => '../' | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # | ||
| # Be sure to run `pod lib lint AgoraRtmControl_iOS.podspec' to ensure this is a | ||
| # valid spec before submitting. | ||
| # | ||
| # Any lines starting with a # are optional, but their use is encouraged | ||
| # To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html | ||
| # | ||
|
|
||
| Pod::Spec.new do |s| | ||
| s.name = 'AgoraRtmControl_iOS' | ||
| s.module_name = 'AgoraRtmControl' | ||
| s.version = ENV['LIB_VERSION'] || '1.8.0' | ||
| s.summary = 'Agora Real-time Messaging Wrapper.' | ||
|
|
||
| s.description = <<-DESC | ||
| Use this Pod to interact with Agora Real-time messaging SDK with additional properties and commands, | ||
| to make the usage simpler with the AgoraRtmController class. | ||
| DESC | ||
|
|
||
| s.homepage = 'https://github.com/AgoraIO-Community/iOS-UIKit' | ||
| s.license = { :type => 'MIT', :file => 'LICENSE' } | ||
| s.author = { 'Max Cobb' => '[email protected]' } | ||
| s.source = { :git => 'https://github.com/AgoraIO-Community/iOS-UIKit.git', :tag => s.version.to_s } | ||
|
|
||
| s.ios.deployment_target = '11.0' | ||
| s.swift_versions = ['5.0'] | ||
|
|
||
| s.static_framework = true | ||
| s.source_files = 'Sources/AgoraRtmControl/*' | ||
| s.dependency 'AgoraRtm_iOS', '~> 1.4.10' | ||
| end |
Oops, something went wrong.