Skip to content

Commit 7a7d619

Browse files
ASTRO-1204: Astro -support Android 14 in player playkit SDK
1 parent 2d78d10 commit 7a7d619

File tree

8 files changed

+31
-15
lines changed

8 files changed

+31
-15
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- name: Checkout repo and clone to CI workspace
2525
uses: actions/checkout@v3
2626

27-
- name: Setup JDK 11
27+
- name: Setup JDK 17
2828
uses: actions/setup-java@v3
2929
with:
30-
java-version: '11'
30+
java-version: '17'
3131
distribution: 'adopt'
3232
cache: 'gradle'
3333

.github/workflows/publish.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ jobs:
5252
mkdir $PWD/.kltrenv && echo "${{ secrets.SIGNING_KEY }}" > $PWD/.kltrenv/secring.gpg.b64
5353
base64 -d $PWD/.kltrenv/secring.gpg.b64 > $PWD/.kltrenv/secring.gpg
5454
55+
- name: Setup JDK 17
56+
uses: actions/setup-java@v3
57+
with:
58+
java-version: '17'
59+
distribution: 'adopt'
60+
cache: 'gradle'
61+
5562
- name: Run publish Script
5663
run: |
5764
RELEASE_TYPE=${RELEASE_TYPE} NEW_VERSION=${NEW_VERSION}

broadpeakplugin/build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ apply plugin: 'kotlin-android'
33
apply from: 'version.gradle'
44

55
android {
6-
compileSdkVersion 33
6+
namespace 'com.kaltura.playkit.plugin.broadpeak'
7+
compileSdk 34
78
compileOptions {
89
sourceCompatibility JavaVersion.VERSION_1_8
910
targetCompatibility JavaVersion.VERSION_1_8
@@ -13,11 +14,19 @@ android {
1314
}
1415
defaultConfig {
1516
minSdkVersion 21
16-
targetSdkVersion 33
17+
targetSdkVersion 34
1718
versionName libVersion
1819
buildConfigField("String","VERSION_NAME","\"${libVersion}\"")
1920
}
20-
21+
buildFeatures {
22+
buildConfig true
23+
}
24+
publishing {
25+
publishing {
26+
singleVariant('release') {
27+
}
28+
}
29+
}
2130
buildTypes {
2231
release {
2332
minifyEnabled false
@@ -29,7 +38,7 @@ android {
2938
dependencies {
3039

3140
// TODO: when tvplayer is released, replace this.
32-
api 'com.kaltura:kaltura-player-android:develop-SNAPSHOT'
41+
api 'com.kaltura:kaltura-player-android:KUX-1761-SNAPSHOT'
3342
//api project(":tvplayer")
3443
api 'tv.broadpeak.smartlib:smartlib-kaltura:04.07.01.4334a05'
3544
}

broadpeakplugin/gradle-mvn-local.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'maven-publish'
22

33
task androidSourcesJar(type: Jar) {
4-
classifier 'sources'
4+
archiveClassifier = 'sources'
55
from android.sourceSets.main.java.sourceFiles
66
}
77

88
project.afterEvaluate {
99
publishing {
1010
publications {
1111
mavenJava(MavenPublication) {
12-
from components.release
12+
from components.findByName('release')
1313
}
1414
}
1515
repositories {

broadpeakplugin/gradle-mvn-push.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ afterEvaluate { project ->
2727
publishing {
2828
publications {
2929
mavenJava(MavenPublication) {
30-
from components.release
30+
from components.findByName('release')
3131
groupId = GROUP
3232
artifactId = POM_ARTIFACT_ID
3333

@@ -97,12 +97,12 @@ afterEvaluate { project ->
9797
}
9898

9999
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
100-
classifier 'javadoc'
100+
archiveClassifier = 'javadoc'
101101
from androidJavadocs.destinationDir
102102
}
103103

104104
task androidSourcesJar(type: Jar) {
105-
classifier 'sources'
105+
archiveClassifier = 'sources'
106106
from android.sourceSets.main.java.sourceFiles
107107
}
108108

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
maven { url "https://jitpack.io" }
1616
}
1717
dependencies {
18-
classpath 'com.android.tools.build:gradle:7.2.1'
18+
classpath 'com.android.tools.build:gradle:8.3.2'
1919
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2020
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
2121
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Nov 04 13:47:59 EET 2020
1+
#Thu Jul 11 16:22:33 IDT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

jitpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jdk:
2-
- openjdk11
2+
- openjdk17
33
before_install:
44
- curl https://kaltura.github.io/fe-tools/android/license.sh | sh

0 commit comments

Comments
 (0)