Merge remote-tracking branch 'origin/master'

Author: weblate

app/build.gradle.kts

@@ -145,7 +145,6 @@ android {
     lint {
         abortOnError = false
         checkReleaseBuilds = false
-        disable.add("MissingTranslation")
     }
 
     buildFeatures {

app/lint.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- ByteOrderMark has errors in values-b+ja/strings.xml, but it's handled by weblate so we don't really care. -->
+    <issue id="ByteOrderMark" severity="ignore" />
+
+    <!-- We don't care about MissingTranslation since it's handled by weblate. -->
+    <issue id="MissingTranslation" severity="ignore" />
+</lint>

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.multiplatform.library) apply false
     alias(libs.plugins.buildkonfig) apply false // Universal build config
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.kotlin.android) apply false

gradle/libs.versions.toml

@@ -112,7 +112,7 @@ work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "w
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+android-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "androidGradlePlugin" }
 buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfigGradlePlugin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }

library/build.gradle.kts

@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     id("maven-publish") // Gradle core plugin
     alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.android.multiplatform.library)
     alias(libs.plugins.buildkonfig)
     alias(libs.plugins.dokka)
 }
@@ -17,7 +17,23 @@ val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
 
 kotlin {
     version = "1.0.1"
-    androidTarget()
+
+    android {
+        // If this is the same com.lagradost.cloudstream3.R stops working
+        namespace = "com.lagradost.api"
+
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        compilerOptions {
+            jvmTarget.set(javaTarget)
+        }
+
+        lint {
+            targetSdk = libs.versions.targetSdk.get().toInt()
+        }
+    }
+
     jvm()
 
     compilerOptions {
@@ -66,40 +82,14 @@ buildkonfig {
 
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
-
         buildConfigField(
             FieldSpec.Type.STRING,
-            "MDL_API_KEY", (System.getenv("MDL_API_KEY") ?: localProperties["mdl.key"]).toString()
+            "MDL_API_KEY",
+            (System.getenv("MDL_API_KEY") ?: localProperties["mdl.key"]).toString()
         )
     }
 }
 
-android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-    }
-
-    // If this is the same com.lagradost.cloudstream3.R stops working
-    namespace = "com.lagradost.api"
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(javaTarget.target)
-        targetCompatibility = JavaVersion.toVersion(javaTarget.target)
-    }
-
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.targetSdk.get().toInt()
-    }
-
-    lint {
-        targetSdk = libs.versions.targetSdk.get().toInt()
-    }
-}
-
 publishing {
     publications {
         withType<MavenPublication> {