Add crossplatform support and replace deprecations (#25)

Luna712 · web-flow · commit 0a036307e73e · 2025-05-30T00:18:25.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,9 @@ jobs:
           path: "builds"
       
       - name: Clean old builds
-        run: rm $GITHUB_WORKSPACE/builds/*.cs3 || true
+        run: |
+          rm $GITHUB_WORKSPACE/builds/*.cs3 || true
+          rm $GITHUB_WORKSPACE/builds/*.jar || true
 
       - name: Setup JDK 17
         uses: actions/setup-java@v1
@@ -45,7 +47,9 @@ jobs:
           cd $GITHUB_WORKSPACE/src
           chmod +x gradlew
           ./gradlew make makePluginsJson
+          ./gradlew ensureJarCompatibility
           cp **/build/*.cs3 $GITHUB_WORKSPACE/builds
+          cp **/build/*.jar $GITHUB_WORKSPACE/builds
           cp build/plugins.json $GITHUB_WORKSPACE/builds
 
       - name: Push builds
diff --git a/DailymotionProvider/build.gradle.kts b/DailymotionProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 cloudstream {
     // All of these properties are optional, you can safely remove any of them.
@@ -18,4 +18,6 @@ cloudstream {
 
     tvTypes = listOf("Others")
     iconUrl = "https://www.google.com/s2/favicons?domain=www.dailymotion.com&sz=%size%"
+
+    isCrossPlatform = true
 }
diff --git a/DailymotionProvider/src/main/kotlin/recloudstream/DailymotionPlugin.kt b/DailymotionProvider/src/main/kotlin/recloudstream/DailymotionPlugin.kt
@@ -1,12 +1,11 @@
 package recloudstream
 
-import android.content.Context
+import com.lagradost.cloudstream3.plugins.BasePlugin
 import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
-import com.lagradost.cloudstream3.plugins.Plugin
 
 @CloudstreamPlugin
-class DailymotionPlugin: Plugin() {
-    override fun load(context: Context) {
+class DailymotionPlugin: BasePlugin() {
+    override fun load() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(DailymotionProvider())
     }
diff --git a/DailymotionProvider/src/main/kotlin/recloudstream/DailymotionProvider.kt b/DailymotionProvider/src/main/kotlin/recloudstream/DailymotionProvider.kt
@@ -1,5 +1,6 @@
 package recloudstream
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.HomePageResponse
 import com.lagradost.cloudstream3.LoadResponse
@@ -20,22 +21,20 @@ import com.lagradost.cloudstream3.utils.loadExtractor
 class DailymotionProvider : MainAPI() {
 
     data class VideoSearchResponse(
-        val list: List<VideoItem>
+        @JsonProperty("list") val list: List<VideoItem>
     )
 
     data class VideoItem(
-        val id: String,
-        val title: String,
-        @Suppress("PropertyName")
-        val thumbnail_360_url: String
+        @JsonProperty("id") val id: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("thumbnail_360_url") val thumbnail360Url: String
     )
 
     data class VideoDetailResponse(
-        val id: String,
-        val title: String,
-        val description: String,
-        @Suppress("PropertyName")
-        val thumbnail_720_url: String
+        @JsonProperty("id") val id: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("description") val description: String,
+        @JsonProperty("thumbnail_720_url") val thumbnail720Url: String
     )
 
     override var mainUrl = "https://api.dailymotion.com"
@@ -81,7 +80,7 @@ class DailymotionProvider : MainAPI() {
             "https://www.dailymotion.com/video/${this.id}",
             TvType.Movie
         ) {
-            this.posterUrl = thumbnail_360_url
+            this.posterUrl = thumbnail360Url
         }
     }
 
@@ -93,7 +92,7 @@ class DailymotionProvider : MainAPI() {
             this.id
         ) {
             plot = description
-            posterUrl = thumbnail_720_url
+            posterUrl = thumbnail720Url
         }
     }
 
diff --git a/InvidiousProvider/build.gradle.kts b/InvidiousProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 7
+version = 8
 
 cloudstream {
     // All of these properties are optional, you can safely remove any of them.
@@ -18,4 +18,6 @@ cloudstream {
 
     tvTypes = listOf("Others")
     iconUrl = "https://www.google.com/s2/favicons?domain=invidious.io&sz=%size%"
+
+    isCrossPlatform = true
 }
diff --git a/InvidiousProvider/src/main/kotlin/recloudstream/InvidiousPlugin.kt b/InvidiousProvider/src/main/kotlin/recloudstream/InvidiousPlugin.kt
@@ -1,12 +1,11 @@
 package recloudstream
 
+import com.lagradost.cloudstream3.plugins.BasePlugin
 import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
-import com.lagradost.cloudstream3.plugins.Plugin
-import android.content.Context
 
 @CloudstreamPlugin
-class InvidiousPlugin: Plugin() {
-    override fun load(context: Context) {
+class InvidiousPlugin: BasePlugin() {
+    override fun load() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(InvidiousProvider())
     }
diff --git a/InvidiousProvider/src/main/kotlin/recloudstream/InvidiousProvider.kt b/InvidiousProvider/src/main/kotlin/recloudstream/InvidiousProvider.kt
@@ -1,6 +1,19 @@
 package recloudstream
 
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.Actor
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.HomePageResponse
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainPageRequest
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newHomePageResponse
+import com.lagradost.cloudstream3.newMovieLoadResponse
+import com.lagradost.cloudstream3.newMovieSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
@@ -85,14 +98,14 @@ class InvidiousProvider : MainAPI() { // all providers must be an instance of Ma
                 title,
                 "${provider.mainUrl}/watch?v=$videoId",
                 TvType.Movie,
-                "$videoId"
+                videoId
             ) {
                 plot = description
                 posterUrl = "${provider.mainUrl}/vi/$videoId/hqdefault.jpg"
                 recommendations = recommendedVideos.map { it.toSearchResponse(provider) }
                 actors = listOf(
                     ActorData(
-                        Actor(author, authorThumbnails.get(authorThumbnails.size - 1)?.url ?: ""),
+                        Actor(author, authorThumbnails.getOrNull(authorThumbnails.size - 1)?.url ?: ""),
                         roleString = "Author"
                     )
                 )
@@ -130,4 +143,4 @@ class InvidiousProvider : MainAPI() { // all providers must be an instance of Ma
         )
         return true
     }
-}
+}
diff --git a/TwitchProvider/build.gradle.kts b/TwitchProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // Use an integer for version numbers
-version = 1
+version = 2
 
 cloudstream {
     // All of these properties are optional, you can safely remove any of them.
@@ -18,4 +18,6 @@ cloudstream {
 
     tvTypes = listOf("Live")
     iconUrl = "https://www.google.com/s2/favicons?domain=twitch.tv&sz=%size%"
+
+    isCrossPlatform = true
 }
diff --git a/TwitchProvider/src/main/kotlin/recloudstream/TwitchPlugin.kt b/TwitchProvider/src/main/kotlin/recloudstream/TwitchPlugin.kt
@@ -1,12 +1,11 @@
 package recloudstream
 
+import com.lagradost.cloudstream3.plugins.BasePlugin
 import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
-import com.lagradost.cloudstream3.plugins.Plugin
-import android.content.Context
 
 @CloudstreamPlugin
-class TwitchPlugin: Plugin() {
-    override fun load(context: Context) {
+class TwitchPlugin: BasePlugin() {
+    override fun load() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(TwitchProvider())
         registerExtractorAPI(TwitchProvider.TwitchExtractor())
diff --git a/TwitchProvider/src/main/kotlin/recloudstream/TwitchProvider.kt b/TwitchProvider/src/main/kotlin/recloudstream/TwitchProvider.kt
@@ -1,6 +1,20 @@
 package recloudstream
 
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.HomePageResponse
+import com.lagradost.cloudstream3.LiveSearchResponse
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainPageRequest
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.fixUrl
+import com.lagradost.cloudstream3.mainPageOf
+import com.lagradost.cloudstream3.newHomePageResponse
+import com.lagradost.cloudstream3.newLiveSearchResponse
+import com.lagradost.cloudstream3.newLiveStreamLoadResponse
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
@@ -26,20 +40,21 @@ class TwitchProvider : MainAPI() {
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         return when (request.name) {
-            gamesName -> HomePageResponse(parseGames(), hasNext = false) // Get top games
+            gamesName -> newHomePageResponse(parseGames(), hasNext = false) // Get top games
             else -> {
                 val doc = app.get(request.data, params = mapOf("page" to page.toString())).document
                 val channels = doc.select("table#channels tr").map { element ->
                     element.toLiveSearchResponse()
                 }
-                HomePageResponse(
+                newHomePageResponse(
                     listOf(
                         HomePageList(
                             request.name,
                             channels,
                             isHorizontalImages = isHorizontal
                         )
-                    ), hasNext = true
+                    ),
+                    hasNext = true
                 )
             }
         }
@@ -50,7 +65,12 @@ class TwitchProvider : MainAPI() {
         val linkName = anchor.attr("href").substringAfterLast("/")
         val name = anchor.firstOrNull { it.text().isNotBlank() }?.text()
         val image = this.select("img").attr("src")
-        return LiveSearchResponse(name ?: "", linkName, this@TwitchProvider.name, TvType.Live, image)
+        return newLiveSearchResponse(
+            name ?: "",
+            linkName,
+            TvType.Live,
+            fix = false
+        ) { posterUrl = image }
     }
 
     private suspend fun parseGames(): List<HomePageList> {
@@ -85,7 +105,7 @@ class TwitchProvider : MainAPI() {
         val poster = doc.select("div.embed-responsive > img").attr("src").ifEmpty { image }
         val description = doc.select("div[style='word-wrap:break-word;font-size:12px;']").text()
         val language = doc.select("a.label.label-soft").text().ifEmpty { null }
-        val isLive = !doc.select("div.live-indicator-container").isEmpty()
+        val isLive = doc.select("div.live-indicator-container").isNotEmpty()
 
         val tags = listOfNotNull(
             isLive.let { if (it) "Live" else "Offline" },
@@ -95,9 +115,14 @@ class TwitchProvider : MainAPI() {
 
         val twitchUrl = "https://twitch.tv/$realUrl"
 
-        return LiveStreamLoadResponse(
-            name, twitchUrl, this.name, twitchUrl, plot = description, posterUrl = image, backgroundPosterUrl = poster, tags = tags
-        )
+        return newLiveStreamLoadResponse(
+            name, twitchUrl, twitchUrl
+        ) {
+            plot = description
+            posterUrl = image
+            backgroundPosterUrl = poster
+            this@newLiveStreamLoadResponse.tags = tags
+        }
     }
 
     override suspend fun search(query: String): List<SearchResponse>? {
@@ -145,4 +170,4 @@ class TwitchProvider : MainAPI() {
             }
         }
     }
-}
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,18 +69,19 @@ subprojects {
     }
 
     dependencies {
-        val cloudstream by configurations
         val implementation by configurations
 
-        // Stubs for all cloudstream classes
-        cloudstream("com.lagradost:cloudstream3:pre-release")
+        implementation("com.github.recloudstream.cloudstream:library-jvm:master-SNAPSHOT")
 
         // These dependencies can include any of those which are added by the app,
         // but you don't need to include any of them if you don't need them.
         // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle.kts
         implementation(kotlin("stdlib")) // Adds Standard Kotlin Features
         implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
         implementation("org.jsoup:jsoup:1.18.3") // HTML Parser
+        // IMPORTANT: Do not bump Jackson above 2.13.1, as newer versions will
+        // break compatibility on older Android devices.
+        implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") // JSON Parser
     }
 }
 
