From 3b13fab2fe637fc2d643eb46152bf38ee0bb74c2 Mon Sep 17 00:00:00 2001 From: Mateusz Glapiak <100378465+mateuszglapiak-dolby@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:50:32 +0200 Subject: [PATCH 1/5] Use correct component name for SDK reporting on iOS (#331) --- ios/Classes/PluginInfo.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/PluginInfo.swift b/ios/Classes/PluginInfo.swift index 9865d657..69986e35 100644 --- a/ios/Classes/PluginInfo.swift +++ b/ios/Classes/PluginInfo.swift @@ -1,6 +1,6 @@ import Foundation enum PluginInfo { - static let componentName = "dolbyio_comms_sdk_flutter" + static let componentName = "flutter-sdk" static let sdkVersion = "3.8.1-beta.1" } From 48e1bbff7b4579081e6a483f6ee6f4ceeadf27ad Mon Sep 17 00:00:00 2001 From: kbetl-dlb <107930816+kbetl-dlb@users.noreply.github.com> Date: Thu, 13 Apr 2023 14:53:00 +0200 Subject: [PATCH 2/5] Update comms sdk flutter plugin version (#334) --- pubspec.yaml | 2 +- test_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 45b4017a..40290c71 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: dolbyio_comms_sdk_flutter description: > Dolby.io Communications SDK for Flutter allows you to create high-quality video conferencing applications for multiple platforms using a single codebase. -version: 3.8.1-beta.1 +version: 3.8.1 homepage: https://github.com/DolbyIO/comms-sdk-flutter environment: diff --git a/test_app/pubspec.yaml b/test_app/pubspec.yaml index b907dcdf..88fba8c5 100644 --- a/test_app/pubspec.yaml +++ b/test_app/pubspec.yaml @@ -1,7 +1,7 @@ name: dolbyio_comms_sdk_flutter_example description: Demonstrates how to use the dolbyio_comms_sdk_flutter plugin. -version: 3.8.1-beta.1+1 +version: 3.8.1+1 # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. From 2e36039da299dfac9f4ddfd680acbbba2c520398 Mon Sep 17 00:00:00 2001 From: kbetl-dlb <107930816+kbetl-dlb@users.noreply.github.com> Date: Thu, 13 Apr 2023 15:30:12 +0200 Subject: [PATCH 3/5] Prepare update script for android (#333) --- android/build.gradle | 13 +++++++++++++ android/gradle.properties | 2 ++ .../sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt | 3 ++- .../kotlin/io/dolby/comms/sdk/flutter/PluginInfo.kt | 8 -------- ios/Classes/PluginInfo.swift | 2 +- scripts/version_update.sh | 7 +++++++ 6 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 android/gradle.properties delete mode 100644 android/src/main/kotlin/io/dolby/comms/sdk/flutter/PluginInfo.kt create mode 100755 scripts/version_update.sh diff --git a/android/build.gradle b/android/build.gradle index 7247837c..5d1dee0d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -60,6 +60,19 @@ android { minSdkVersion 21 consumerProguardFiles 'proguard-rules.pro' } + + buildTypes { + release { + minifyEnabled false + buildConfigField "String", "SDK_VERSION", COMMS_SDK_VERSION + buildConfigField "String", "COMPONENT_NAME", COMPONENT_NAME + } + + debug { + buildConfigField "String", "SDK_VERSION", COMMS_SDK_VERSION + buildConfigField "String", "COMPONENT_NAME", COMPONENT_NAME + } + } } dependencies { diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..5896b82b --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,2 @@ +COMMS_SDK_VERSION="3.8.1" +COMPONENT_NAME="flutter-sdk" \ No newline at end of file diff --git a/android/src/main/kotlin/io/dolby/comms/sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt b/android/src/main/kotlin/io/dolby/comms/sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt index be32e217..4abf91dc 100644 --- a/android/src/main/kotlin/io/dolby/comms/sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt +++ b/android/src/main/kotlin/io/dolby/comms/sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt @@ -2,6 +2,7 @@ package io.dolby.comms.sdk.flutter import androidx.annotation.NonNull import com.voxeet.VoxeetSDK +import io.dolby.comms.sdk.flutter.dolbyio_comms_sdk_flutter.BuildConfig import io.dolby.comms.sdk.flutter.events.* import io.dolby.comms.sdk.flutter.module.CommandServiceNativeModule import io.dolby.comms.sdk.flutter.module.CommsSdkNativeModule @@ -72,7 +73,7 @@ class DolbyioCommsSdkFlutterPlugin : FlutterPlugin, ActivityAware { MediaDeviceServiceNativeModule(scope) ) - VoxeetSDK.registerComponentVersion(PluginInfo.COMPONENT_NAME, PluginInfo.SDK_VERSION) + VoxeetSDK.registerComponentVersion(BuildConfig.COMPONENT_NAME, BuildConfig.SDK_VERSION) nativeModules.forEach { it.onAttached(flutterPluginBinding) } nativeEventEmitters.forEach { it.onAttached(flutterPluginBinding) } diff --git a/android/src/main/kotlin/io/dolby/comms/sdk/flutter/PluginInfo.kt b/android/src/main/kotlin/io/dolby/comms/sdk/flutter/PluginInfo.kt deleted file mode 100644 index 8911d905..00000000 --- a/android/src/main/kotlin/io/dolby/comms/sdk/flutter/PluginInfo.kt +++ /dev/null @@ -1,8 +0,0 @@ -package io.dolby.comms.sdk.flutter - -import java.nio.file.attribute.AclEntry.Builder - -object PluginInfo { - const val COMPONENT_NAME = "dolbyio_comms_sdk_flutter" - const val SDK_VERSION = "3.8.2-beta.1" -} \ No newline at end of file diff --git a/ios/Classes/PluginInfo.swift b/ios/Classes/PluginInfo.swift index 69986e35..fb7661c7 100644 --- a/ios/Classes/PluginInfo.swift +++ b/ios/Classes/PluginInfo.swift @@ -2,5 +2,5 @@ import Foundation enum PluginInfo { static let componentName = "flutter-sdk" - static let sdkVersion = "3.8.1-beta.1" + static let sdkVersion = "3.8.1" } diff --git a/scripts/version_update.sh b/scripts/version_update.sh new file mode 100755 index 00000000..9420480f --- /dev/null +++ b/scripts/version_update.sh @@ -0,0 +1,7 @@ + #!/bin/bash +VERSION=`grep -E -o "version: (.*)" ./pubspec.yaml | cut -d ':' -f 2 | xargs` +echo Current version = $VERSION + +# Uncomment when ios part will be prepared +sed -i '' "s/sdkVersion = \".*\"/sdkVersion = \"$VERSION\"/g" ./ios/Classes/PluginInfo.swift +sed -i '' "s/COMMS_SDK_VERSION=\".*\"/COMMS_SDK_VERSION=\"$VERSION\"/g" ./android/gradle.properties From 0e5acf8edadebeaecd527723c5b2fa1dbbb9f2f9 Mon Sep 17 00:00:00 2001 From: kbetl-dlb Date: Thu, 13 Apr 2023 15:44:57 +0200 Subject: [PATCH 4/5] upgrade sdk android to latest path version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 5d1dee0d..0c70db33 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' buildscript { ext.kotlin_version = '1.7.10' - ext.voxeet_sdk_version = "3.8.1" + ext.voxeet_sdk_version = "3.8.+" ext.dagger_version = "2.40.5" repositories { google() From 285f6f2acec843c5de435971d7427aa7b7c066cb Mon Sep 17 00:00:00 2001 From: Monika <66684637+mhelf-dolby@users.noreply.github.com> Date: Fri, 14 Apr 2023 13:58:28 +0200 Subject: [PATCH 5/5] Added the 3.8.1 release note (#335) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad928638..554f04b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.8.1 + +### Features + +Introduced new methods and event handlers to the [NotificationService](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/NotificationService-class.html) that allow participants to [subscribe](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/NotificationService/subscribe.html) to and [unsubscribe](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/NotificationService/unsubscribe.html) from the preferred notifications. + ## 3.8.1-beta.1 ### Features