First steps for multiplatform api

.idea/gradle.xml

@@ -4,17 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/library" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle.kts

@@ -232,6 +232,8 @@ dependencies {
     implementation("androidx.work:work-runtime:2.9.0")
     implementation("androidx.work:work-runtime-ktx:2.9.0")
     implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
+
+    implementation(project(":library"))
 }
 
 tasks.register("androidSourcesJar", Jar::class) {

app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt

@@ -743,8 +743,6 @@ fun base64Encode(array: ByteArray): String {
     }
 }
 
-class ErrorLoadingException(message: String? = null) : Exception(message)
-
 fun MainAPI.fixUrlNull(url: String?): String? {
     if (url.isNullOrEmpty()) {
         return null

app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt

@@ -0,0 +1,16 @@
+package com.lagradost.cloudstream3.mvvm
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+
+/** NOTE: Only one observer at a time per value */
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.removeObservers(this)
+    liveData.observe(this) { it?.let { t -> action(t) } }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.removeObservers(this)
+    liveData.observe(this) { action(it) }
+}

build.gradle.kts

@@ -26,6 +26,6 @@ plugins {
     id("com.google.devtools.ksp") version "1.9.22-1.0.16" apply false
 }
 
-tasks.register<Delete>("clean") {
+//tasks.register<Delete>("clean") {
-    delete(rootProject.layout.buildDirectory)
+//    delete(rootProject.layout.buildDirectory)
-}
+//}

library/build.gradle.kts

@@ -0,0 +1,58 @@
+plugins {
+    kotlin("multiplatform")
+    id("maven-publish")
+    id("com.android.library")
+}
+
+kotlin {
+    androidTarget()
+    jvm()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
+            implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser
+            ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API
+            Level 25 or Less. */
+            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
+        }
+    }
+}
+
+repositories {
+    mavenLocal()
+    maven("https://jitpack.io")
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+}
+
+android {
+    compileSdk = 34
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 33
+    }
+
+    // If this is the same com.lagradost.cloudstream3.R stops working
+    namespace = "com.lagradost.api"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+//publishing {
+//    publications {
+//        create<MavenPublication>("maven") {
+//            groupId = "com.lagradost"
+//            artifactId = "api"
+//            version = "0.1.0"
+//            from(components["java"])
+//        }
+//    }
+//}

library/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

library/src/androidMain/kotlin/com/lagradost/api/BuildConfig.kt

@@ -0,0 +1,7 @@
+package com.lagradost.api
+
+actual class BuildConfig {
+    actual companion object {
+        actual val DEBUG = true
+    }
+}

library/src/androidMain/kotlin/com/lagradost/api/Log.kt

@@ -0,0 +1,21 @@
+package com.lagradost.api
+
+import android.util.Log
+
+actual object Log {
+    actual fun d(tag: String, message: String) {
+        Log.d(tag, message)
+    }
+
+    actual fun i(tag: String, message: String) {
+        Log.i(tag, message)
+    }
+
+    actual fun w(tag: String, message: String) {
+        Log.w(tag, message)
+    }
+
+    actual fun e(tag: String, message: String) {
+        Log.e(tag, message)
+    }
+}

library/src/commonMain/kotlin/com/lagradost/api/BuildConfig.kt

@@ -0,0 +1,7 @@
+package com.lagradost.api
+
+expect class BuildConfig {
+    companion object {
+        val DEBUG: Boolean
+    }
+}

library/src/commonMain/kotlin/com/lagradost/api/Log.kt

@@ -0,0 +1,8 @@
+package com.lagradost.api
+
+expect object Log {
+    fun d(tag: String, message: String)
+    fun i(tag: String, message: String)
+    fun w(tag: String, message: String)
+    fun e(tag: String, message: String)
+}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainApi.kt

@@ -0,0 +1,3 @@
+package com.lagradost.cloudstream3
+
+class ErrorLoadingException(message: String? = null) : Exception(message)

library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt

@@ -1,10 +1,7 @@
 package com.lagradost.cloudstream3.mvvm
 
-import android.util.Log
+import com.lagradost.api.BuildConfig
-import androidx.lifecycle.LifecycleOwner
+import com.lagradost.api.Log
-import androidx.lifecycle.LiveData
-import com.bumptech.glide.load.HttpException
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.ErrorLoadingException
 import kotlinx.coroutines.*
 import java.io.InterruptedIOException
@@ -49,18 +46,6 @@ inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
     }
 }
 
-/** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
-    liveData.removeObservers(this)
-    liveData.observe(this) { it?.let { t -> action(t) } }
-}
-
-/** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
-    liveData.removeObservers(this)
-    liveData.observe(this) { action(it) }
-}
-
 sealed class Resource<out T> {
     data class Success<out T>(val value: T) : Resource<T>()
     data class Failure(
@@ -158,14 +143,14 @@ fun<T> throwAbleToResource(
                 "Connection Timeout\nPlease try again later."
             )
         }
-        is HttpException -> {
+//        is HttpException -> {
-            Resource.Failure(
+//            Resource.Failure(
-                false,
+//                false,
-                throwable.statusCode,
+//                throwable.statusCode,
-                null,
+//                null,
-                throwable.message ?: "HttpException"
+//                throwable.message ?: "HttpException"
-            )
+//            )
-        }
+//        }
         is UnknownHostException -> {
             Resource.Failure(true, null, null, "Cannot connect to server, try again later.\n${throwable.message}")
         }

library/src/jvmMain/kotlin/com/lagradost/api/BuildConfig.kt

@@ -0,0 +1,7 @@
+package com.lagradost.api
+
+actual class BuildConfig {
+    actual companion object {
+        actual val DEBUG = true
+    }
+}

library/src/jvmMain/kotlin/com/lagradost/api/Log.kt

@@ -0,0 +1,19 @@
+package com.lagradost.api
+
+actual object Log {
+    actual fun d(tag: String, message: String) {
+        println("DEBUG $tag: $message")
+    }
+
+    actual fun i(tag: String, message: String) {
+        println("INFO $tag: $message")
+    }
+
+    actual fun w(tag: String, message: String) {
+        println("WARNING $tag: $message")
+    }
+
+    actual fun e(tag: String, message: String) {
+        println("ERROR $tag: $message")
+    }
+}

settings.gradle.kts

@@ -1,3 +1,4 @@
 rootProject.name = "CloudStream"
 
 include(":app")
+include(":library")