From 7a7d619593aa149836c614522735e34e56a51cc9 Mon Sep 17 00:00:00 2001 From: Volodymyr Bondarenko Date: Wed, 2 Oct 2024 11:23:23 +0300 Subject: [PATCH 1/2] ASTRO-1204: Astro -support Android 14 in player playkit SDK --- .github/workflows/build.yml | 4 ++-- .github/workflows/publish.yml | 7 +++++++ broadpeakplugin/build.gradle | 17 +++++++++++++---- broadpeakplugin/gradle-mvn-local.gradle | 4 ++-- broadpeakplugin/gradle-mvn-push.gradle | 6 +++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- jitpack.yml | 2 +- 8 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bb948a..acfd212 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,10 @@ jobs: - name: Checkout repo and clone to CI workspace uses: actions/checkout@v3 - - name: Setup JDK 11 + - name: Setup JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: 'gradle' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5ec97fa..e681023 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -52,6 +52,13 @@ jobs: mkdir $PWD/.kltrenv && echo "${{ secrets.SIGNING_KEY }}" > $PWD/.kltrenv/secring.gpg.b64 base64 -d $PWD/.kltrenv/secring.gpg.b64 > $PWD/.kltrenv/secring.gpg + - name: Setup JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + cache: 'gradle' + - name: Run publish Script run: | RELEASE_TYPE=${RELEASE_TYPE} NEW_VERSION=${NEW_VERSION} diff --git a/broadpeakplugin/build.gradle b/broadpeakplugin/build.gradle index 350abb1..199b8e3 100644 --- a/broadpeakplugin/build.gradle +++ b/broadpeakplugin/build.gradle @@ -3,7 +3,8 @@ apply plugin: 'kotlin-android' apply from: 'version.gradle' android { - compileSdkVersion 33 + namespace 'com.kaltura.playkit.plugin.broadpeak' + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -13,11 +14,19 @@ android { } defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionName libVersion buildConfigField("String","VERSION_NAME","\"${libVersion}\"") } - + buildFeatures { + buildConfig true + } + publishing { + publishing { + singleVariant('release') { + } + } + } buildTypes { release { minifyEnabled false @@ -29,7 +38,7 @@ android { dependencies { // TODO: when tvplayer is released, replace this. - api 'com.kaltura:kaltura-player-android:develop-SNAPSHOT' + api 'com.kaltura:kaltura-player-android:KUX-1761-SNAPSHOT' //api project(":tvplayer") api 'tv.broadpeak.smartlib:smartlib-kaltura:04.07.01.4334a05' } diff --git a/broadpeakplugin/gradle-mvn-local.gradle b/broadpeakplugin/gradle-mvn-local.gradle index 6d0d890..389f44f 100644 --- a/broadpeakplugin/gradle-mvn-local.gradle +++ b/broadpeakplugin/gradle-mvn-local.gradle @@ -1,7 +1,7 @@ apply plugin: 'maven-publish' task androidSourcesJar(type: Jar) { - classifier 'sources' + archiveClassifier = 'sources' from android.sourceSets.main.java.sourceFiles } @@ -9,7 +9,7 @@ project.afterEvaluate { publishing { publications { mavenJava(MavenPublication) { - from components.release + from components.findByName('release') } } repositories { diff --git a/broadpeakplugin/gradle-mvn-push.gradle b/broadpeakplugin/gradle-mvn-push.gradle index aa75ba7..ffc90c9 100644 --- a/broadpeakplugin/gradle-mvn-push.gradle +++ b/broadpeakplugin/gradle-mvn-push.gradle @@ -27,7 +27,7 @@ afterEvaluate { project -> publishing { publications { mavenJava(MavenPublication) { - from components.release + from components.findByName('release') groupId = GROUP artifactId = POM_ARTIFACT_ID @@ -97,12 +97,12 @@ afterEvaluate { project -> } task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier 'javadoc' + archiveClassifier = 'javadoc' from androidJavadocs.destinationDir } task androidSourcesJar(type: Jar) { - classifier 'sources' + archiveClassifier = 'sources' from android.sourceSets.main.java.sourceFiles } diff --git a/build.gradle b/build.gradle index 972c4b8..b730065 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 485b436..3c2b939 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 04 13:47:59 EET 2020 +#Thu Jul 11 16:22:33 IDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/jitpack.yml b/jitpack.yml index 02ab496..6bfd6a5 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,4 +1,4 @@ jdk: - - openjdk11 + - openjdk17 before_install: - curl https://kaltura.github.io/fe-tools/android/license.sh | sh From db28ae20f1aa5b62e69c75458911426ffec53131 Mon Sep 17 00:00:00 2001 From: Volodymyr Bondarenko Date: Thu, 3 Oct 2024 18:40:59 +0300 Subject: [PATCH 2/2] ASTRO-1204: Astro -support Android 14 in player playkit SDK --- broadpeakplugin/build.gradle | 4 ++-- broadpeakplugin/src/main/AndroidManifest.xml | 2 +- build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/broadpeakplugin/build.gradle b/broadpeakplugin/build.gradle index 199b8e3..e11e65f 100644 --- a/broadpeakplugin/build.gradle +++ b/broadpeakplugin/build.gradle @@ -6,8 +6,8 @@ android { namespace 'com.kaltura.playkit.plugin.broadpeak' compileSdk 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } lintOptions { abortOnError false diff --git a/broadpeakplugin/src/main/AndroidManifest.xml b/broadpeakplugin/src/main/AndroidManifest.xml index 912f5c0..de749ac 100644 --- a/broadpeakplugin/src/main/AndroidManifest.xml +++ b/broadpeakplugin/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index b730065..adffdc8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ ext["signingPassword"] = System.getenv('SIGNING_PASSWORD') buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral()