Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v5
- name: "Setup JDK"
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'gradle'
- name: "Build & Test"
run: ./gradlew clean assembleDebug testDebugUnitTest
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
jobs:
publish:
name: "Release"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v5
- name: "Setup JDK"
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'gradle'
- name: "Build & Release"
run: ./gradlew clean library:assembleRelease androidJavaDocJar androidSourcesJar generatePomFileForNexusPublication publishNexusPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ repositories {
}

dependencies {
implementation 'com.devbrackets.android:exomedia:5.2.0'
// See MavenCentral or the tag at the beginning of the Readme for the latest version
implementation 'com.devbrackets.android:exomedia:x.x.x'
}
```

Expand Down Expand Up @@ -74,7 +75,7 @@ fun onPrepared() {

License
-------
Copyright 2015-2024 ExoMedia Contributors
Copyright 2015-2025 ExoMedia Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ dependencies {

android {
namespace 'com.devbrackets.android.exomediademo'
compileSdk 35
compileSdk = 36

defaultConfig {
applicationId "com.devbrackets.android.exomediademo"
minSdkVersion 21
targetSdkVersion 35
targetSdkVersion 36
versionCode 1
versionName "1.0.0"
}
Expand Down
42 changes: 22 additions & 20 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
[versions]
activityCompose = "1.9.3"
androidGradlePlugin = "8.7.3"
appcompat = "1.7.0"
coil = "3.0.4"
compiler = "4.12.0"
constraintlayout = "2.2.0"
coreKtx = "1.15.0"
activityCompose = "1.10.1"
androidGradlePlugin = "8.12.0"
appcompat = "1.7.1"
coil = "3.3.0"
compiler = "4.16.0"
constraintlayout = "2.2.1"
coreKtx = "1.17.0"
glide = "4.16.0"
junit = "4.13.2"
kotlin = "2.0.20"
leakcanaryAndroid = "2.7"
media = "1.7.0"
media3Exoplayer = "1.5.1"
navigationCompose = "2.8.5"
nexusPublish = "1.1.0"
playlistcore = "2.1.0"
robolectric = "4.13"
composeUi = "1.7.6"
composeMaterial3 = "1.3.1"
kotlin = "2.2.10"
leakcanaryAndroid = "2.14"
media = "1.7.1"
media3Exoplayer = "1.8.0"
navigationCompose = "2.9.3"
nexusPublish = "2.0.0"
playlistcore = "2.2.0"
robolectric = "4.15.1"
composeUi = "1.9.0"
composeIcons = "1.7.8"
composeMaterial3 = "1.3.2"

[libraries]
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
Expand All @@ -27,8 +28,8 @@ coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil"
coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "compiler" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" }
compose-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "composeUi" }
compose-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "composeUi" }
compose-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "composeIcons" }
compose-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "composeIcons" }
constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
Expand Down Expand Up @@ -56,4 +57,5 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublish" }

maven-publish = { id = "maven-publish" }
signing = { id = "signing" }
11 changes: 5 additions & 6 deletions gradle/release/publish.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@

apply plugin: "maven-publish"
apply plugin: "signing"

task androidJavaDoc(type: Javadoc) {
tasks.register('androidJavaDoc', Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
options.encoding "UTF-8"
Expand All @@ -12,12 +9,13 @@ task androidJavaDoc(type: Javadoc) {
failOnError false
}

task androidJavaDocJar(type: Jar, dependsOn: androidJavaDoc) {
tasks.register('androidJavaDocJar', Jar) {
dependsOn androidJavaDoc
archiveClassifier.set('javadoc')
from androidJavaDoc.destinationDir
}

task androidSourcesJar(type: Jar) {
tasks.register('androidSourcesJar', Jar) {
archiveClassifier.set('sources')
from android.sourceSets.main.java.srcDirs
}
Expand All @@ -26,6 +24,7 @@ task androidSourcesJar(type: Jar) {
* Helper to add dependencies to the POM node. This is needed during manual construction
* of the dependencies block
*/
@SuppressWarnings('UnnecessaryQualifiedReference')
static def addPomDependency(groovy.util.Node dependenciesNode, Dependency dependency, String dependencyScope) {
// Ignore incomplete dependencies
if (dependency.name == null || dependency.name == 'unspecified' || dependency.group == null || dependency.version == null) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 4 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias libs.plugins.android.library
alias libs.plugins.kotlin.android
alias libs.plugins.maven.publish
alias libs.plugins.signing
}

afterEvaluate {
Expand All @@ -27,11 +29,11 @@ dependencies {

android {
namespace 'com.devbrackets.android.exomedia'
compileSdk 35
compileSdk =36

defaultConfig {
minSdkVersion 21
targetSdkVersion 35
targetSdkVersion 36

vectorDrawables.useSupportLibrary = true

Expand Down
2 changes: 1 addition & 1 deletion libraryInfo.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ ARTIFACT_ID = exomedia
GROUP_ID = com.devbrackets.android

VERSION_MAJOR = 5
VERSION_MINOR = 2
VERSION_MINOR = 3
VERSION_PATCH = 0
VERSION_PRE_RELEASE =