diff --git a/Armadillo/build.gradle b/Armadillo/build.gradle index d90ff00..7067f63 100644 --- a/Armadillo/build.gradle +++ b/Armadillo/build.gradle @@ -50,17 +50,35 @@ android { } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' - implementation "com.google.android.exoplayer:exoplayer-core:${EXOPLAYER_VERSION}" - implementation "com.google.android.exoplayer:exoplayer-hls:${EXOPLAYER_VERSION}" - implementation "com.google.android.exoplayer:exoplayer-dash:${EXOPLAYER_VERSION}" - implementation "com.google.android.exoplayer:extension-mediasession:${EXOPLAYER_VERSION}" + implementation files('../libs/exoplayer-core-release.aar') + implementation "com.google.android.exoplayer:exoplayer-common:${EXOPLAYER_VERSION}" + implementation ("com.google.android.exoplayer:exoplayer-hls:${EXOPLAYER_VERSION}") { + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } + implementation ("com.google.android.exoplayer:exoplayer-dash:${EXOPLAYER_VERSION}") { + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } + implementation ("com.google.android.exoplayer:extension-mediasession:${EXOPLAYER_VERSION}"){ + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } + implementation ("com.google.android.exoplayer:exoplayer-database:${EXOPLAYER_VERSION}") { + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } + implementation ("com.google.android.exoplayer:exoplayer-datasource:${EXOPLAYER_VERSION}") { + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } + implementation ("com.google.android.exoplayer:exoplayer-extractor:${EXOPLAYER_VERSION}") { + exclude group: 'com.google.android.exoplayer', module: 'exoplayer-core' + } implementation "io.reactivex.rxjava2:rxjava:${RXJAVA_VERSION}" implementation "io.reactivex.rxjava2:rxandroid:${RXANDROID_VERSION}" implementation "com.google.dagger:dagger:${DAGGER_VERSION}" + kapt "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" implementation 'androidx.media:media:1.6.0' implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:${SERIALIZATON_VERSION}" diff --git a/Armadillo/src/main/AndroidManifest.xml b/Armadillo/src/main/AndroidManifest.xml index 7beb28c..bd22d28 100644 --- a/Armadillo/src/main/AndroidManifest.xml +++ b/Armadillo/src/main/AndroidManifest.xml @@ -4,6 +4,9 @@ + + + diff --git a/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt b/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt index a14afa9..8d23e0f 100644 --- a/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt +++ b/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt @@ -57,6 +57,7 @@ internal class ArmadilloNotificationDeleteReceiver(val application: Application) */ override fun setDeleteIntentOnNotification(notification: Notification) { val intent = Intent(ArmadilloNotificationDeleteReceiver.ACTION) + intent.`package` = application.packageName val intentFlag = if (hasSnowCone()) PendingIntent.FLAG_MUTABLE else 0 val pendingIntent = PendingIntent.getBroadcast(application, 0, intent, intentFlag) notification.deleteIntent = pendingIntent diff --git a/README.md b/README.md index dc0bf3e..4f2968b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ The library is hosted with Github packages so you will need to add the Github re 1. Generate a personal access token from your Github account. 2. Add the Github package registry with authentication to your `build.gradle` file. +3. For Armadillo version 4.0.1: Add a gradle dependency for com.google.android.exoplayer:exoplayer-core:2.19.1. If you wish to use + downloading in Android 14 you will need to use a forked version of this dependency since Exoplayer does not support Android 14. ```kotlin maven { diff --git a/RELEASE.md b/RELEASE.md index 6a7bf0b..23b17e7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,10 @@ # Project Armadillo Release Notes +## 1.4.1 +- Fixes Download Service issues on Android 14. +- Removes the Exoplayer 2.19.1 `core` module that does not support Android 14. This module must now be included separately by your + project for this version. + ## 1.4.0 - Targets Android 14 (SDK 34), with appropriate service permissions. diff --git a/TestApp/build.gradle b/TestApp/build.gradle index 87d4ca9..3c0780a 100644 --- a/TestApp/build.gradle +++ b/TestApp/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + compileOnly files('../libs/exoplayer-core-release.aar') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' diff --git a/TestApp/src/androidTest/java/com/scribd/armadillotestapp/ExampleInstrumentedTest.kt b/TestApp/src/androidTest/java/com/scribd/armadillotestapp/ExampleInstrumentedTest.kt deleted file mode 100644 index 581828b..0000000 --- a/TestApp/src/androidTest/java/com/scribd/armadillotestapp/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.scribd.armadillotestapp - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("com.scribd.armadillotestapp", appContext.packageName) - } -} diff --git a/TestApp/src/main/AndroidManifest.xml b/TestApp/src/main/AndroidManifest.xml index 68d3893..2e637d8 100644 --- a/TestApp/src/main/AndroidManifest.xml +++ b/TestApp/src/main/AndroidManifest.xml @@ -4,6 +4,9 @@ + + + diff --git a/gradle.properties b/gradle.properties index 4cd888b..a1997b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ org.gradle.jvmargs=-Xmx1536m # org.gradle.parallel=true PACKAGE_NAME=com.scribd.armadillo GRADLE_PLUGIN_VERSION=7.2.0 -LIBRARY_VERSION=1.4.0 -EXOPLAYER_VERSION=2.17.1 +LIBRARY_VERSION=1.4.1 +EXOPLAYER_VERSION=2.19.1 RXJAVA_VERSION=2.2.4 RXANDROID_VERSION=2.0.1 DAGGER_VERSION=2.16 diff --git a/libs/exoplayer-core-release.aar b/libs/exoplayer-core-release.aar new file mode 100644 index 0000000..6191dc5 Binary files /dev/null and b/libs/exoplayer-core-release.aar differ