Use drm-core 3.2.0.

Author: io7m

.ci

@@ -5,7 +5,6 @@ import org.joda.time.Instant
 import org.librarysimplified.http.api.LSHTTPClientType
 import org.librarysimplified.services.api.ServiceDirectoryType
 import org.nypl.drm.core.AdobeAdeptExecutorType
-import org.nypl.drm.core.AxisNowServiceType
 import org.nypl.simplified.accounts.database.api.AccountType
 import org.nypl.simplified.books.api.Book
 import org.nypl.simplified.books.audio.AudioBookManifestStrategiesType
@@ -33,7 +32,6 @@ interface BorrowContextType {
   val application: Application
   val account: AccountType
   val adobeExecutor: AdobeAdeptExecutorType?
-  val axisNowService: AxisNowServiceType?
   val audioBookManifestStrategies: AudioBookManifestStrategiesType
   val bundledContent: BundledContentResolverType
   val clock: () -> Instant

org.thepalaceproject.android.platform

@@ -5,7 +5,6 @@ import org.joda.time.Instant
 import org.librarysimplified.http.api.LSHTTPClientType
 import org.librarysimplified.services.api.ServiceDirectoryType
 import org.nypl.drm.core.AdobeAdeptExecutorType
-import org.nypl.drm.core.AxisNowServiceType
 import org.nypl.simplified.books.audio.AudioBookManifestStrategiesType
 import org.nypl.simplified.books.book_registry.BookRegistryType
 import org.nypl.simplified.books.borrowing.subtasks.BorrowSubtaskDirectoryType
@@ -24,7 +23,6 @@ data class BorrowRequirements(
   val application: Application,
   val adobeExecutor: AdobeAdeptExecutorType?,
   val audioBookManifestStrategies: AudioBookManifestStrategiesType,
-  val axisNowService: AxisNowServiceType?,
   val bookFormatSupport: BookFormatSupportType,
   val bookRegistry: BookRegistryType,
   val bundledContent: BundledContentResolverType,
@@ -51,7 +49,6 @@ data class BorrowRequirements(
         application = application,
         adobeExecutor = services.optionalService(AdobeAdeptExecutorType::class.java),
         audioBookManifestStrategies = services.requireService(AudioBookManifestStrategiesType::class.java),
-        axisNowService = services.optionalService(AxisNowServiceType::class.java),
         bookFormatSupport = services.requireService(BookFormatSupportType::class.java),
         bookRegistry = services.requireService(BookRegistryType::class.java),
         bundledContent = services.requireService(BundledContentResolverType::class.java),

simplified-books-borrowing/src/main/java/org/nypl/simplified/books/borrowing/BorrowContextType.kt

@@ -6,7 +6,6 @@ import org.joda.time.Instant
 import org.librarysimplified.http.api.LSHTTPClientType
 import org.librarysimplified.services.api.ServiceDirectoryType
 import org.nypl.drm.core.AdobeAdeptExecutorType
-import org.nypl.drm.core.AxisNowServiceType
 import org.nypl.simplified.accounts.database.api.AccountType
 import org.nypl.simplified.books.api.Book
 import org.nypl.simplified.books.api.BookID
@@ -189,7 +188,6 @@ class BorrowTask private constructor(
         application = this.requirements.application,
         account = this.account,
         adobeExecutor = this.requirements.adobeExecutor,
-        axisNowService = this.requirements.axisNowService,
         lcpService = this.requirements.lcpService,
         audioBookManifestStrategies = this.requirements.audioBookManifestStrategies,
         bookDatabaseEntry = this.databaseEntry!!,
@@ -459,7 +457,6 @@ class BorrowTask private constructor(
     private val temporaryDirectory: File,
     var currentOPDSAcquisitionPathElement: OPDSAcquisitionPathElement,
     override val adobeExecutor: AdobeAdeptExecutorType?,
-    override val axisNowService: AxisNowServiceType?,
     override val lcpService: LcpService?,
     override val services: ServiceDirectoryType,
     private val cacheDirectory: File,

simplified-books-borrowing/src/main/java/org/nypl/simplified/books/borrowing/BorrowRequirements.kt

@@ -11,7 +11,6 @@ class BorrowSubtaskDirectory : BorrowSubtaskDirectoryType {
     listOf(
       BorrowACSM,
       BorrowAudioBook,
-      BorrowAxisNow,
       BorrowBearerToken,
       BorrowCopy,
       // BorrowSAMLDownload must precede BorrowDirectDownload in precedence.