diff --git a/.github/publish.sh b/.github/publish.sh index 5066d61..3c142c3 100644 --- a/.github/publish.sh +++ b/.github/publish.sh @@ -42,7 +42,7 @@ set_version() { fi if [ "$RELEASE_TYPE" == "Full" ]; then echo "RELEASE_TYPE = '$RELEASE_TYPE'" - perl -pi -e "s/:playkit-android:dev-SNAPSHOT/.playkit:playkit:$NEW_VERSION/" $BUILD_GRADLE + perl -pi -e "s/:playkit-android:.*?-SNAPSHOT/.playkit:playkit:$NEW_VERSION/" $BUILD_GRADLE fi } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07735d9..cdf69fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,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 c74a1b8..a13d336 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -50,6 +50,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/build.gradle b/build.gradle index 474607b..74de40d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,14 +7,14 @@ ext["signingKeyId"] = System.getenv('SIGNING_KEYID') ext["signingPassword"] = System.getenv('SIGNING_PASSWORD') buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() 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' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e8dc74..3c2b939 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 01 12:27:53 IDT 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 dd7fa11..09ce364 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 diff --git a/youboraplugin/build.gradle b/youboraplugin/build.gradle index 49567ac..41b4b40 100644 --- a/youboraplugin/build.gradle +++ b/youboraplugin/build.gradle @@ -3,14 +3,15 @@ apply plugin: 'kotlin-android' apply from: 'version.gradle' android { - compileSdkVersion 33 + namespace 'com.kaltura.playkit.plugin.youbora' + compileSdk 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } defaultConfig { - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionName libVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String","VERSION_NAME","\"${libVersion}\"") @@ -24,15 +25,25 @@ android { } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } + buildFeatures { + buildConfig = true + } + + publishing { + publishing { + singleVariant('release') { + } + } + } } dependencies { //TODO change to latest playkit version after tagging. - implementation 'com.kaltura:playkit-android:dev-SNAPSHOT' + implementation 'com.kaltura:playkit-android:KUX-1761-SNAPSHOT' //implementation project(":playkit") api 'com.nicepeopleatwork:youboralib:6.8.4' diff --git a/youboraplugin/gradle-mvn-local.gradle b/youboraplugin/gradle-mvn-local.gradle index 6d0d890..389f44f 100644 --- a/youboraplugin/gradle-mvn-local.gradle +++ b/youboraplugin/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/youboraplugin/gradle-mvn-push.gradle b/youboraplugin/gradle-mvn-push.gradle index e26cac0..f2c6402 100644 --- a/youboraplugin/gradle-mvn-push.gradle +++ b/youboraplugin/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/youboraplugin/src/main/AndroidManifest.xml b/youboraplugin/src/main/AndroidManifest.xml index 12d9351..94cbbcf 100644 --- a/youboraplugin/src/main/AndroidManifest.xml +++ b/youboraplugin/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/PKYouboraPlayerAdapter.java b/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/PKYouboraPlayerAdapter.java index da67074..c5b6b01 100644 --- a/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/PKYouboraPlayerAdapter.java +++ b/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/PKYouboraPlayerAdapter.java @@ -14,7 +14,8 @@ import android.text.TextUtils; -import com.kaltura.android.exoplayer2.upstream.HttpDataSource; +import com.kaltura.androidx.media3.common.util.UnstableApi; +import com.kaltura.androidx.media3.datasource.HttpDataSource; import com.kaltura.playkit.BuildConfig; import com.kaltura.playkit.MessageBus; import com.kaltura.playkit.PKAudioCodec; @@ -51,7 +52,7 @@ /** * @hide */ - +@UnstableApi class PKYouboraPlayerAdapter extends PlayerAdapter { private static final PKLog log = PKLog.get("PKYouboraPlayerAdapter"); diff --git a/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/YouboraPlugin.java b/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/YouboraPlugin.java index 5b993c9..148b9e7 100644 --- a/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/YouboraPlugin.java +++ b/youboraplugin/src/main/java/com/kaltura/playkit/plugins/youbora/YouboraPlugin.java @@ -6,6 +6,7 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; +import com.kaltura.androidx.media3.common.util.UnstableApi; import com.kaltura.playkit.InterceptorEvent; import com.kaltura.playkit.MessageBus; import com.kaltura.playkit.PKDrmParams; @@ -33,7 +34,7 @@ /** * Created by zivilan on 02/11/2016. */ - +@UnstableApi public class YouboraPlugin extends PKPlugin { private static final PKLog log = PKLog.get("YouboraPlugin");