Skip to content

Commit

Permalink
Merge pull request #59 from voxeet/develop
Browse files Browse the repository at this point in the history
Merge Develop into master
  • Loading branch information
codlab authored Oct 19, 2021
2 parents cbf2470 + 51ce917 commit f841553
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release Notes

### 1.5.5 (Oct 19th, 2021)
- bump iOS SDK to 3.2.2 and iOS UXKit to 1.5.2

### 1.5.4 (Jul 8th, 2021 & Jul 27th, 2021)
- bump iOS SDK to 3.2.0 and iOS UXKit to 1.5.0
- bump Android SDK to 3.2.1 and Android UXKit to 3.2.1
Expand Down
2 changes: 1 addition & 1 deletion carthage.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set -euo pipefail;xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX);trap 'rm -f "$xcconfig"' INT TERM HUP EXIT;echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig;echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig;export XCODE_XCCONFIG_FILE="$xcconfig";carthage "$@"
set -euo pipefail;xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX);trap 'rm -f "$xcconfig"' INT TERM HUP EXIT;CURRENT_XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | cut -d' ' -f2 | cut -d'.' -f1)00";CURRENT_XCODE_BUILD=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3);echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_${CURRENT_XCODE_VERSION}__BUILD_${CURRENT_XCODE_BUILD} = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig;echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig;echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig;export XCODE_XCCONFIG_FILE="$xcconfig";carthage "$@"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-voxeet",
"version": "1.5.4",
"version": "1.5.5",
"description": "Cordova Voxeet Plugin",
"cordova": {
"id": "cordova-plugin-voxeet",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-voxeet"
version="1.5.4">
version="1.5.5">
<name>Voxeet</name>
<description>Cordova Voxeet Plugin</description>
<license>Apache 2.0 License</license>
Expand Down
4 changes: 2 additions & 2 deletions src/ios/Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "voxeet/voxeet-uxkit-ios" == 1.5.0
binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" == 3.2.0
github "voxeet/voxeet-uxkit-ios" == 1.5.2
binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" == 3.2.2
4 changes: 2 additions & 2 deletions src/ios/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" "3.2.0"
binary "https://raw.githubusercontent.com/voxeet/voxeet-sdk-ios/master/VoxeetSDK.json" "3.2.2"
github "SDWebImage/SDWebImage" "5.11.0"
github "voxeet/voxeet-uxkit-ios" "1.5.0"
github "voxeet/voxeet-uxkit-ios" "1.5.2"

0 comments on commit f841553

Please sign in to comment.