From 6c6b3bfbd4b281cba0edcc73d36515591d6cf74f Mon Sep 17 00:00:00 2001 From: William Van Haevre Date: Thu, 21 Dec 2023 16:34:49 +0100 Subject: [PATCH 1/7] Clarify distinction between license setup methods --- doc/theoplayerview-component.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/theoplayerview-component.md b/doc/theoplayerview-component.md index 4c912534e..9c5c9d941 100644 --- a/doc/theoplayerview-component.md +++ b/doc/theoplayerview-component.md @@ -40,13 +40,13 @@ The `THEOplayerView` component accepts a `config` property that contains basic p ```typescript const player: PlayerConfiguration = { - license: undefined, //'insert THEOplayer license here' + license: undefined, //'insert THEOplayer license for react-native here' chromeless: true, }; ``` The `license` is an obfuscated string that contains the THEOplayer license needed for play-out, and which can be found -in your THEOplayer Portal account. If separate licenses per platform are needed, `Platform.select()` could be used to +in your THEOplayer Portal account. You can generate a license specifically for react-native, but if separate licenses per platform are needed, `Platform.select()` could be used to configure them: ```typescript From 31ad4ffe1fbed3a635b4bdb400f723f096d0719a Mon Sep 17 00:00:00 2001 From: William Van Haevre Date: Thu, 21 Dec 2023 16:35:10 +0100 Subject: [PATCH 2/7] Briefly explain ui config on PlayerConfiguration --- doc/theoplayerview-component.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/theoplayerview-component.md b/doc/theoplayerview-component.md index 9c5c9d941..ab8dc6d12 100644 --- a/doc/theoplayerview-component.md +++ b/doc/theoplayerview-component.md @@ -73,6 +73,10 @@ We refer to the [Adaptive Bitrate (ABR)](abr.md) page for detailed information, If `chromeless = true`, the player does not include the native UI provided by the SDK and it is expected the UI is created in React Native. The accompanying example application provides a basic UI created in React Native. +#### Native UI language + +`PlayerConfiguration.ui` has a configuration proerty 'language' that allows you to set the language for localisation when native UI elements (e.g. 'skip ad' being displayed on the skip butten in the ad UI) are presented to the user. This only applies to UI elements rendered by the native SDK's and not to other UI elements added via your react-native view stack. + ### Setting a source You can set a source using the `source` property on the [THEOplayer API](../src/api/player/THEOplayer.ts). The type From 77b3821d40b3794a5c1b1194c803ee8b45880316 Mon Sep 17 00:00:00 2001 From: William Van Haevre Date: Thu, 21 Dec 2023 16:48:19 +0100 Subject: [PATCH 3/7] fix typo --- doc/theoplayerview-component.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/theoplayerview-component.md b/doc/theoplayerview-component.md index ab8dc6d12..796f9f023 100644 --- a/doc/theoplayerview-component.md +++ b/doc/theoplayerview-component.md @@ -75,7 +75,7 @@ created in React Native. The accompanying example application provides a basic U #### Native UI language -`PlayerConfiguration.ui` has a configuration proerty 'language' that allows you to set the language for localisation when native UI elements (e.g. 'skip ad' being displayed on the skip butten in the ad UI) are presented to the user. This only applies to UI elements rendered by the native SDK's and not to other UI elements added via your react-native view stack. +`PlayerConfiguration.ui` has a configuration property 'language' that allows you to set the language for localisation when native UI elements (e.g. 'skip ad' being displayed on the skip butten in the ad UI) are presented to the user. This only applies to UI elements rendered by the native SDK's and not to other UI elements added via your react-native view stack. ### Setting a source From e8dde2eb22c73b45a33cc3a4d140fcf96cc5cceb Mon Sep 17 00:00:00 2001 From: Tom Van Laerhoven Date: Thu, 21 Dec 2023 17:19:17 +0100 Subject: [PATCH 4/7] Allow configurable kotlin gradle plugin version --- android/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 0569eb089..41901bcfc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,8 @@ buildscript { + ext.safeExtGet = { prop, fallback -> + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback + } + repositories { google() mavenCentral() @@ -6,7 +10,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.8.21')}" } } From 62252da71087063f8a12f2e096230e213486e5ff Mon Sep 17 00:00:00 2001 From: Tom Van Laerhoven Date: Thu, 21 Dec 2023 17:20:53 +0100 Subject: [PATCH 5/7] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91f54f2b6..51ebda36b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.4.1] - 23-12-21 + +### Changed + +- Take the Gradle Kotlin plugin version from the root project, if specified. + ## [3.4.0] - 23-12-21 ### Added From 7ecdc6760185003eac9ed58396e407d2d0ffb9ef Mon Sep 17 00:00:00 2001 From: Tom Van Laerhoven Date: Thu, 21 Dec 2023 17:22:06 +0100 Subject: [PATCH 6/7] Fix changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ebda36b..90218cf54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed -- Take the Gradle Kotlin plugin version from the root project, if specified. +- Take the Kotlin Gradle plugin version from the root project, if specified. ## [3.4.0] - 23-12-21 From 30ec3f3362fe65ea366e910e44191de73d0665d8 Mon Sep 17 00:00:00 2001 From: Tom Van Laerhoven Date: Thu, 21 Dec 2023 17:23:01 +0100 Subject: [PATCH 7/7] 3.4.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b43da595d..fd441c911 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "react-native-theoplayer", - "version": "3.4.0", + "version": "3.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "react-native-theoplayer", - "version": "3.4.0", + "version": "3.4.1", "license": "SEE LICENSE AT https://www.theoplayer.com/terms", "dependencies": { "buffer": "^6.0.3" diff --git a/package.json b/package.json index 0be298921..62cc2758c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-theoplayer", - "version": "3.4.0", + "version": "3.4.1", "description": "A THEOplayer video component for react-native.", "main": "lib/commonjs/index", "module": "lib/module/index",