Upgrade to R2 beta.

ThePalaceProject · Jun 10, 2024 · 66e068d · 66e068d
1 parent 5912496
commit 66e068d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/org.thepalaceproject.drm.core/src/main/java/org/nypl/drm/core/AdobeAdeptAssets.kt b/org.thepalaceproject.drm.core/src/main/java/org/nypl/drm/core/AdobeAdeptAssets.kt
@@ -4,7 +4,6 @@ import org.readium.r2.shared.util.Url
 import org.readium.r2.shared.util.asset.ContainerAsset
 import org.readium.r2.shared.util.data.CompositeContainer
 import org.readium.r2.shared.util.file.FileResource
-import org.readium.r2.shared.util.format.AdeptSpecification
 import org.readium.r2.shared.util.format.Format
 import org.readium.r2.shared.util.format.FormatSpecification
 import org.readium.r2.shared.util.format.Specification
@@ -61,7 +60,7 @@ object AdobeAdeptAssets {
 
     val specifications = mutableSetOf<Specification>()
     specifications.addAll(epubAsset.format.specification.specifications)
-    specifications.add(AdeptSpecification)
+    specifications.add(Specification.Adept)
 
     val formatSpecification =
       FormatSpecification(epubAsset.format.specification.specifications)

diff --git a/org.thepalaceproject.drm.core/src/main/java/org/nypl/drm/core/AdobeAdeptErrors.kt b/org.thepalaceproject.drm.core/src/main/java/org/nypl/drm/core/AdobeAdeptErrors.kt
@@ -1,15 +1,15 @@
 package org.nypl.drm.core
 
 import org.readium.r2.shared.util.Error
-import org.readium.r2.shared.util.format.AdeptSpecification
 import org.nypl.drm.core.AdobeAdeptAssets.ENCRYPTION_PATH
 import org.nypl.drm.core.AdobeAdeptAssets.RIGHTS_PATH
+import org.readium.r2.shared.util.format.Specification
 
 data object AdobeErrorNoSpecification : Error {
   override val cause: Error? =
     null
   override val message: String =
-    "The given asset does not have $AdeptSpecification in its format"
+    "The given asset does not have ${Specification.Adept} in its format"
 }
 
 data object AdobeErrorNotContainer : Error {