Merge pull request #68 from cacheung/master

Roku 2.2.6 release
Adobe-Marketing-Cloud · Jan 14, 2022 · 397fc27 · 397fc27
2 parents 75d45db + 4295328
commit 397fc27
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 33 deletions.
diff --git a/sdks/roku/ReleaseNotes.md b/sdks/roku/ReleaseNotes.md
@@ -5,6 +5,10 @@ Included are notes from the latest major revision to current.
 For full documentation please visit:
 https://docs.adobe.com/content/help/en/media-analytics/using/sdk-implement/download-sdks.html
 
+## 2.2.6 (13 January, 2022)
+What's new :
+- Removed usage of deprecated [GetVersion() Roku API](https://developer.roku.com/docs/references/brightscript/interfaces/ifdeviceinfo.md#getversion-as-string).
+
 ## 2.2.5 (5 May, 2021)
 What's new :
 - Added fix to generate correct Roku OS version string for OS version 10 and above.

diff --git a/sdks/roku/libs/adbmobile.brs b/sdks/roku/libs/adbmobile.brs
@@ -21,7 +21,7 @@ Library "v30/bslCore.brs"
 Function ADBMobile() As Object
  if GetGlobalAA().ADBMobile = invalid
  instance = {
- version: "2.2.5",
+ version: "2.2.6",
  PRIVACY_STATUS_OPT_IN: "optedin",
  PRIVACY_STATUS_OPT_OUT: "optedout",
 
@@ -647,16 +647,10 @@ Function _adb_deviceInfo() as Object
  End Function,
  _getRokuOSVersionString: Function(deviceInfo as Object) As String
  rokuVersionString = ""
+ ''' GetVersion API has been deprecated, GetOSVersion API is available from Roku OS 9.2 and above
  if FindMemberFunction(deviceInfo,"GetOSVersion") <> Invalid
  rokuVersionObj = deviceInfo.GetOSVersion()
- ''' Use new version format for OSVersion 10.X and above
- if StrToI(rokuVersionObj.major) >= 10
- rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor +"."+ rokuVersionObj.revision + "-" + rokuVersionObj.build
- endif
- endif
- if rokuVersionString = ""
- ''' Support for devices with OS version < 9.2
- rokuVersionString = deviceInfo.GetVersion()
+ rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor + "." + rokuVersionObj.revision + "-" + rokuVersionObj.build
  endif
  return rokuVersionString
  End Function,
@@ -5830,8 +5824,8 @@ Function _adb_media_version() as Object
  ''' initialize the private variables
  _init: Function() As Void
  m["_platform"] = "roku"
- m["_buildNumber"] = "11"
- m["_gitHash"] = "513b24"
+ m["_buildNumber"] = "16"
+ m["_gitHash"] = "73a9ee"
  m["_api_level"] = 4
  End Function
  }

diff --git a/sdks/roku/samples/SampleSceneGraphPlayer/source/adbmobile.brs b/sdks/roku/samples/SampleSceneGraphPlayer/source/adbmobile.brs
@@ -21,7 +21,7 @@ Library "v30/bslCore.brs"
 Function ADBMobile() As Object
  if GetGlobalAA().ADBMobile = invalid
  instance = {
- version: "2.2.5",
+ version: "2.2.6",
  PRIVACY_STATUS_OPT_IN: "optedin",
  PRIVACY_STATUS_OPT_OUT: "optedout",
 
@@ -647,16 +647,10 @@ Function _adb_deviceInfo() as Object
  End Function,
  _getRokuOSVersionString: Function(deviceInfo as Object) As String
  rokuVersionString = ""
+ ''' GetVersion API has been deprecated, GetOSVersion API is available from Roku OS 9.2 and above
  if FindMemberFunction(deviceInfo,"GetOSVersion") <> Invalid
  rokuVersionObj = deviceInfo.GetOSVersion()
- ''' Use new version format for OSVersion 10.X and above
- if StrToI(rokuVersionObj.major) >= 10
- rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor +"."+ rokuVersionObj.revision + "-" + rokuVersionObj.build
- endif
- endif
- if rokuVersionString = ""
- ''' Support for devices with OS version < 9.2
- rokuVersionString = deviceInfo.GetVersion()
+ rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor + "." + rokuVersionObj.revision + "-" + rokuVersionObj.build
  endif
  return rokuVersionString
  End Function,
@@ -5830,8 +5824,8 @@ Function _adb_media_version() as Object
  ''' initialize the private variables
  _init: Function() As Void
  m["_platform"] = "roku"
- m["_buildNumber"] = "11"
- m["_gitHash"] = "513b24"
+ m["_buildNumber"] = "16"
+ m["_gitHash"] = "73a9ee"
  m["_api_level"] = 4
  End Function
  }

diff --git a/sdks/roku/samples/adoberokudemo/source/adbmobile.brs b/sdks/roku/samples/adoberokudemo/source/adbmobile.brs
@@ -21,7 +21,7 @@ Library "v30/bslCore.brs"
 Function ADBMobile() As Object
  if GetGlobalAA().ADBMobile = invalid
  instance = {
- version: "2.2.5",
+ version: "2.2.6",
  PRIVACY_STATUS_OPT_IN: "optedin",
  PRIVACY_STATUS_OPT_OUT: "optedout",
 
@@ -647,16 +647,10 @@ Function _adb_deviceInfo() as Object
  End Function,
  _getRokuOSVersionString: Function(deviceInfo as Object) As String
  rokuVersionString = ""
+ ''' GetVersion API has been deprecated, GetOSVersion API is available from Roku OS 9.2 and above
  if FindMemberFunction(deviceInfo,"GetOSVersion") <> Invalid
  rokuVersionObj = deviceInfo.GetOSVersion()
- ''' Use new version format for OSVersion 10.X and above
- if StrToI(rokuVersionObj.major) >= 10
- rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor +"."+ rokuVersionObj.revision + "-" + rokuVersionObj.build
- endif
- endif
- if rokuVersionString = ""
- ''' Support for devices with OS version < 9.2
- rokuVersionString = deviceInfo.GetVersion()
+ rokuVersionString = rokuVersionObj.major + "." + rokuVersionObj.minor + "." + rokuVersionObj.revision + "-" + rokuVersionObj.build
  endif
  return rokuVersionString
  End Function,
@@ -5830,8 +5824,8 @@ Function _adb_media_version() as Object
  ''' initialize the private variables
  _init: Function() As Void
  m["_platform"] = "roku"
- m["_buildNumber"] = "11"
- m["_gitHash"] = "513b24"
+ m["_buildNumber"] = "16"
+ m["_gitHash"] = "73a9ee"
  m["_api_level"] = 4
  End Function
  }