Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependencies #282

Merged
merged 8 commits into from
Oct 4, 2022
Merged

Upgrade dependencies #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0adc697
upgrade gradle
armendh Jul 10, 2022
e36652d
make maven publishing conditional
armendh Jul 10, 2022
3f273b5
- upgdate gradle files for pdfium and pspdfkit
armendh Jul 11, 2022
ee0c2c2
- replace CONTENT_TYPE_MUSIC with AUDIO_CONTENT_TYPE_MUSIC in ExoMedi…
armendh Jul 12, 2022
b878a64
Merge branch 'develop' into upgrade
mickael-menu Aug 9, 2022
43dff0f
Merge branch 'develop' of github.com:readium/kotlin-toolkit into upgrade
qnga Oct 4, 2022
1922433
Upgrade dependencies
qnga Oct 4, 2022
124bf8b
Cosmetic changes in build scripts
qnga Oct 4, 2022
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
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official

android.disableAutomaticComponentCreation=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
17 changes: 9 additions & 8 deletions readium/adapters/pdfium/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand Down
23 changes: 12 additions & 11 deletions readium/adapters/pdfium/pdfium-document/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium-document"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium-document"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -63,11 +64,11 @@ dependencies {

api(project(":readium:shared"))

implementation("androidx.core:core-ktx:1.8.0")
implementation("androidx.core:core-ktx:1.9.0")
implementation("com.github.barteksc:pdfium-android:1.8.2")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

testImplementation("junit:junit:4.13.2")

Expand Down
23 changes: 12 additions & 11 deletions readium/adapters/pdfium/pdfium-navigator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium-navigator"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pdfium-navigator"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -66,10 +67,10 @@ dependencies {
api(project(":readium:adapters:pdfium:pdfium-document"))

api("com.github.barteksc:android-pdf-viewer:2.8.2")
implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation("androidx.fragment:fragment-ktx:1.5.3")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

testImplementation("junit:junit:4.13.2")

Expand Down
17 changes: 9 additions & 8 deletions readium/adapters/pspdfkit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand Down
23 changes: 12 additions & 11 deletions readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit-document"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit-document"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -63,11 +64,11 @@ dependencies {

api(project(":readium:shared"))

implementation("androidx.core:core-ktx:1.8.0")
implementation("androidx.core:core-ktx:1.9.0")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.pspdfkit:pspdfkit:8.2.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

testImplementation("junit:junit:4.13.2")

Expand Down
23 changes: 12 additions & 11 deletions readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit-navigator"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-adapter-pspdfkit-navigator"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -65,11 +66,11 @@ dependencies {
api(project(":readium:navigator"))
api(project(":readium:adapters:pspdfkit:pspdfkit-document"))

implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation("androidx.fragment:fragment-ktx:1.5.3")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.pspdfkit:pspdfkit:8.2.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

testImplementation("junit:junit:4.13.2")

Expand Down
24 changes: 13 additions & 11 deletions readium/lcp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,16 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {
groupId = "com.github.readium"
artifactId = "readium-lcp"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-lcp"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -58,13 +59,13 @@ afterEvaluate {
dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

api(project(":readium:shared"))

implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.core:core-ktx:1.7.0")
implementation("com.google.android.material:material:1.6.0")
implementation("androidx.core:core-ktx:1.9.0")
implementation("com.google.android.material:material:1.6.1")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.mcxiaoke.koi:async:0.5.5") {
exclude(module = "support-v4")
Expand All @@ -81,6 +82,7 @@ dependencies {
implementation("androidx.room:room-runtime:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
kapt("androidx.room:room-compiler:$roomVersion")
kapt("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0")

// Tests
testImplementation("junit:junit:4.13.2")
Expand Down
27 changes: 14 additions & 13 deletions readium/navigator-media2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,17 @@ android {
}
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("release") {
publishing {
publications {
create<MavenPublication>("release") {

groupId = "com.github.readium"
artifactId = "readium-navigator-media2"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))

afterEvaluate {
from(components.getByName("release"))
groupId = "com.github.readium"
artifactId = "readium-navigator-media2"
artifact(tasks.findByName("sourcesJar"))
artifact(tasks.findByName("javadocsJar"))
}
}
}
Expand All @@ -64,19 +66,18 @@ dependencies {
api(project(":readium:shared"))
api(project(":readium:navigator"))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

implementation("com.jakewharton.timber:timber:5.0.1")

implementation("androidx.media2:media2-session:1.2.1")
implementation("androidx.media2:media2-player:1.2.1")

implementation("com.google.android.exoplayer:exoplayer-core:2.17.1")
implementation("com.google.android.exoplayer:extension-media2:2.17.1")
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
implementation("com.google.android.exoplayer:extension-media2:2.18.1")

testImplementation("junit:junit:4.13.2")

androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
}
2 changes: 1 addition & 1 deletion readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ class MediaNavigator private constructor(
.setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))
.setAudioAttributes(
AudioAttributes.Builder()
.setContentType(C.CONTENT_TYPE_MUSIC)
.setContentType(C.AUDIO_CONTENT_TYPE_MUSIC )
.setUsage(C.USAGE_MEDIA)
.build(),
true
Expand Down
Loading