diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92c2f8e..a974093 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 8b1c0eb..49f43c6 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,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' } diff --git a/dtgdemo/build.gradle b/dtgdemo/build.gradle index 21b282b..e2a6392 100644 --- a/dtgdemo/build.gradle +++ b/dtgdemo/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + namespace 'com.kaltura.dtg.demo' + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -10,8 +11,8 @@ android { defaultConfig { applicationId "com.kaltura.dtg.demo" - minSdkVersion 17 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 multiDexEnabled true versionCode 1 versionName "1.0" @@ -37,8 +38,8 @@ repositories { dependencies { implementation project(':dtglib') - implementation 'com.kaltura.playkit:playkit:4.21.0' - implementation 'com.kaltura.playkit:playkitproviders:4.21.0' + implementation 'com.kaltura:playkit-android:KUX-1761-SNAPSHOT' + implementation'com.kaltura:playkit-android-providers:KUX-1761-SNAPSHOT' // implementation project(":playkit") // implementation project(":providers") diff --git a/dtglib/build.gradle b/dtglib/build.gradle index 032f96c..a7f44c5 100644 --- a/dtglib/build.gradle +++ b/dtglib/build.gradle @@ -2,10 +2,11 @@ apply plugin: 'com.android.library' apply from: 'version.gradle' android { - compileSdkVersion 33 + namespace 'com.kaltura.dtg' + compileSdk 34 defaultConfig { - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionName dtglibVersion // defined in version.gradle testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String","VERSION_NAME","\"${dtglibVersion}\"") @@ -17,7 +18,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - + buildFeatures { + buildConfig true + } + publishing { + publishing { + singleVariant('release') { + } + } + } testOptions { unitTests.returnDefaultValues = true } diff --git a/dtglib/gradle-mvn-local.gradle b/dtglib/gradle-mvn-local.gradle index 6d0d890..389f44f 100644 --- a/dtglib/gradle-mvn-local.gradle +++ b/dtglib/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/dtglib/gradle-mvn-push.gradle b/dtglib/gradle-mvn-push.gradle index be25701..3497643 100644 --- a/dtglib/gradle-mvn-push.gradle +++ b/dtglib/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/dtglib/src/main/java/com/kaltura/dtg/exoparser/C.java b/dtglib/src/main/java/com/kaltura/dtg/exoparser/C.java index 41c6383..c053c17 100755 --- a/dtglib/src/main/java/com/kaltura/dtg/exoparser/C.java +++ b/dtglib/src/main/java/com/kaltura/dtg/exoparser/C.java @@ -226,7 +226,7 @@ private C() {} public static final int STREAM_TYPE_DEFAULT = STREAM_TYPE_MUSIC; /** - * Content types for {@link com.kaltura.android.exoplayer2.audio.AudioAttributes}. + * Content types for {@link com.kaltura.androidx.media3.exoplayer.audio.AudioAttributes}. */ @Retention(RetentionPolicy.SOURCE) @IntDef({CONTENT_TYPE_MOVIE, CONTENT_TYPE_MUSIC, CONTENT_TYPE_SONIFICATION, CONTENT_TYPE_SPEECH, @@ -257,7 +257,7 @@ private C() {} android.media.AudioAttributes.CONTENT_TYPE_UNKNOWN; /** - * Flags for {@link com.kaltura.android.exoplayer2.audio.AudioAttributes}. + * Flags for {@link com.kaltura.androidx.media3.exoplayer.audio.AudioAttributes}. *

* Note that {@code FLAG_HW_AV_SYNC} is not available because the player takes care of setting the * flag when tunneling is enabled via a track selector. @@ -272,7 +272,7 @@ private C() {} android.media.AudioAttributes.FLAG_AUDIBILITY_ENFORCED; /** - * Usage types for {@link com.kaltura.android.exoplayer2.audio.AudioAttributes}. + * Usage types for {@link com.kaltura.androidx.media3.exoplayer.audio.AudioAttributes}. */ @Retention(RetentionPolicy.SOURCE) @IntDef({USAGE_ALARM, USAGE_ASSISTANCE_ACCESSIBILITY, USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b6b2692..eca50d2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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