Skip to content

Commit c857358

Browse files
tvanlaerhoventvanlaerhoven
authored
Merge pull request #386 from THEOplayer/feature/next-11
Feature/next 11
2 parents cbf22a8 + 2f73a67 commit c857358

46 files changed

Lines changed: 152 additions & 108 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/moody-words-wear.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
'@theoplayer/react-native-analytics-adobe-edge': minor
3+
'@theoplayer/react-native-analytics-adscript': minor
4+
'@theoplayer/react-native-analytics-bitmovin': minor
5+
'@theoplayer/react-native-analytics-comscore': minor
6+
'@theoplayer/react-native-analytics-conviva': minor
7+
'@theoplayer/react-native-analytics-nielsen': minor
8+
'@theoplayer/react-native-yospace': minor
9+
'@theoplayer/react-native-analytics-youbora': minor
10+
'@theoplayer/react-native-analytics-gemius': minor
11+
'@theoplayer/react-native-analytics-adobe': minor
12+
'@theoplayer/react-native-analytics-agama': minor
13+
'@theoplayer/react-native-drm': minor
14+
'@theoplayer/react-native-analytics-mux': minor
15+
---
16+
17+
Added support for THEOplayer v11 and React Native THEOplayer v11.

‎adobe-edge/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
### ✨ Features
3131

32-
- Add support for THEOplayer v10 and React Native THEOplayer v10.
32+
- Added support for THEOplayer v10 and React Native THEOplayer v10.
3333

3434
## 0.5.0
3535

‎adobe-edge/android/build.gradle‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
22
// Buildscript is evaluated before everything else so we can't use getExtOrDefault
3-
def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : '1.9.10'
3+
def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : '2.2.10'
44

55
repositories {
66
google()
77
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath "com.android.tools.build:gradle:7.2.2"
11+
classpath "com.android.tools.build:gradle:8.12.3"
1212
// noinspection DifferentKotlinGradleVersion
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
@@ -18,8 +18,10 @@ def isNewArchitectureEnabled() {
1818
return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
1919
}
2020

21-
apply plugin: 'com.android.library'
22-
apply plugin: 'kotlin-android'
21+
plugins {
22+
id 'com.android.library'
23+
id 'kotlin-android'
24+
}
2325

2426
if (isNewArchitectureEnabled()) {
2527
apply plugin: "com.facebook.react"
@@ -31,11 +33,11 @@ def safeExtGet(prop, fallback) {
3133

3234
android {
3335
namespace = "com.theoplayer.reactnative.adobe.edge"
34-
compileSdkVersion safeExtGet("THEOplayerAdobeEdge_compileSdkVersion", 35)
36+
compileSdkVersion safeExtGet("THEOplayerAdobeEdge_compileSdkVersion", 36)
3537

3638
defaultConfig {
3739
minSdkVersion safeExtGet("THEOplayerAdobeEdge_minSdkVersion", 21)
38-
targetSdkVersion safeExtGet("THEOplayerAdobeEdge_targetSdkVersion", 35)
40+
targetSdkVersion safeExtGet("THEOplayerAdobeEdge_targetSdkVersion", 36)
3941
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
4042
versionCode 1
4143
versionName "1.0"
@@ -67,8 +69,8 @@ repositories {
6769
}
6870

6971
// The Adobe connector requires at least THEOplayer SDK v9.0.0.
70-
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[9.0.0, 10.0.0)')
71-
def kotlin_version = safeExtGet("THEOplayerAdobeEdge_kotlinVersion", "1.9.10")
72+
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[9.0.0, 12.0.0)')
73+
def kotlin_version = safeExtGet("THEOplayerAdobeEdge_kotlinVersion", "2.2.10")
7274
def gsonVersion = safeExtGet('gsonVersion', '2.13.1')
7375

7476
dependencies {

‎adobe-edge/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"react": "*",
5959
"react-native": "*",
6060
"react-native-device-info": "^14.0.4",
61-
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10",
62-
"theoplayer": "^7 || ^8 || ^9 || ^10"
61+
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10 || ^11",
62+
"theoplayer": "^7 || ^8 || ^9 || ^10 || ^11"
6363
},
6464
"peerDependenciesMeta": {
6565
"theoplayer": {

‎adobe/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
### ✨ Features
6363

64-
- Add support for THEOplayer v10 and React Native THEOplayer v10.
64+
- Added support for THEOplayer v10 and React Native THEOplayer v10.
6565

6666
## 1.11.0
6767

‎adobe/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ repositories {
7070
}
7171

7272
// The Adobe connector requires at least THEOplayer SDK v9.0.0.
73-
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[9.0.0, 11.0.0)')
73+
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[9.0.0, 12.0.0)')
7474
def kotlin_version = safeExtGet("THEOplayerAdobe_kotlinVersion", "2.2.10")
7575
def serialization_version = '1.9.0'
7676

‎adobe/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"react": "*",
5757
"react-native": "*",
5858
"react-native-device-info": "^14.0.4",
59-
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10",
60-
"theoplayer": "^7 || ^8 || ^9 || ^10"
59+
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10 || ^11",
60+
"theoplayer": "^7 || ^8 || ^9 || ^10 || ^11"
6161
},
6262
"peerDependenciesMeta": {
6363
"theoplayer": {

‎adscript/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
### ✨ Features
2424

25-
- Add support for THEOplayer v10 and React Native THEOplayer v10.
25+
- Added support for THEOplayer v10 and React Native THEOplayer v10.
2626

2727
## 1.0.0
2828

‎adscript/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ rootProject.allprojects {
7575
}
7676

7777
// The AdScript connector requires at least THEOplayer SDK v5.11.0.
78-
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[5.11.0, 11.0.0)')
78+
def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[5.11.0, 12.0.0)')
7979
def kotlin_version = safeExtGet("THEOplayerAdScript_kotlinVersion", "2.2.10")
8080
def adscript_version = safeExtGet("THEOplayerAdScript_adscriptVersion", "1.0.10")
8181

‎adscript/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"peerDependencies": {
5858
"react": "*",
5959
"react-native": "*",
60-
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10",
61-
"theoplayer": "^7 || ^8 || ^9 || ^10"
60+
"react-native-theoplayer": "^7 || ^8 || ^9 || ^10 || ^11",
61+
"theoplayer": "^7 || ^8 || ^9 || ^10 || ^11"
6262
},
6363
"peerDependenciesMeta": {
6464
"theoplayer": {

0 commit comments

Comments
 (0)