[skip ci] refactor: Refactor and simplify common libraries (#2807)

.github/scripts/bump-versions.sh

@@ -72,7 +72,7 @@ bumpVersion() {
 
 findAndBump() {
     for lib in $@; do
-        for file in $(grep -l -R ":lib-$lib" --include "build.gradle" --include "additional.gradle"); do
+        for file in $(grep -l -R ":lib:$lib" --include "build.gradle" --include "additional.gradle"); do
             # prevent bumping the same extension multiple times
             if [[ ! $bumpedFiles =~ ( |^)$file( |$) ]]; then
                 if [[ $file =~ ^multisrc ]]; then

build-plugins/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation(libs.gradle.agp)
+    implementation(libs.gradle.kotlin)
+    implementation(libs.gradle.kotlin.serialization)
+    // Workaround: https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+}
+
+kotlin {
+    // To access AndroidConfig
+    sourceSets.getByName("main").kotlin.srcDir("../buildSrc/src/main/kotlin")
+}

build-plugins/settings.gradle.kts

@@ -0,0 +1,9 @@
+apply(from = "../repositories.gradle.kts")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

build-plugins/src/main/kotlin/lib-android.gradle.kts

@@ -0,0 +1,23 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    id("kotlinx-serialization")
+}
+
+android {
+    compileSdk = AndroidConfig.compileSdk
+
+    defaultConfig {
+        minSdk = AndroidConfig.minSdk
+    }
+
+    namespace = "eu.kanade.tachiyomi.lib.${name.replace("-", "")}"
+}
+
+val libs = the<LibrariesForLibs>()
+
+dependencies {
+    compileOnly(libs.bundles.common)
+}

build-plugins/src/main/kotlin/lib-kotlin.gradle.kts

@@ -0,0 +1,12 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
+plugins {
+    `java-library`
+    kotlin("jvm")
+}
+
+val libs = the<LibrariesForLibs>()
+
+dependencies {
+    compileOnly(libs.kotlin.stdlib)
+}

gradle/libs.versions.toml

@@ -5,6 +5,10 @@ kotlin_version = "1.8.22"
 serialization_version = "1.5.1"
 
 [libraries]
+gradle-agp = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
+gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" }
+gradle-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
+
 aniyomi-lib = { module = "com.github.aniyomiorg:extensions-lib", version = "14" }
 
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin_version" }

lib/blogger-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.bloggerextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/burstcloud-extractor/build.gradle.kts

@@ -1,18 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    id("kotlinx-serialization")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.burstcloudextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/chillx-extractor/build.gradle.kts

@@ -1,21 +1,8 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.chillxextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:cryptoaes"))
-    implementation(project(":lib-cryptoaes"))
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }
-// BUMPS: 0

lib/cloudflare-interceptor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.cloudflareinterceptor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/cryptoaes/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.cryptoaes"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.kotlin.stdlib)
 }

lib/dailymotion-extractor/build.gradle.kts

@@ -1,19 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.dailymotionextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }

lib/dataimage/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.dataimage"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/dood-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.doodextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/fastream-extractor/build.gradle.kts

@@ -1,21 +1,10 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.fastreamextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
-    compileOnly(libs.bundles.common)
 }

lib/filemoon-extractor/build.gradle.kts

@@ -1,22 +1,10 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    id("kotlinx-serialization")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.filemoonextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
-    compileOnly(libs.bundles.common)
 }

lib/fusevideo-extractor/build.gradle.kts

@@ -1,18 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.fusevideoextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }

lib/gdriveplayer-extractor/build.gradle.kts

@@ -1,20 +1,8 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.gdriveplayerextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:cryptoaes"))
-    implementation(project(":lib-cryptoaes"))
+    implementation(project(":lib:unpacker"))
-    implementation(project(":lib-unpacker"))
 }

lib/gogostream-extractor/build.gradle.kts

@@ -1,19 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.gogostreamextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }

lib/googledrive-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.googledriveextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/javcoverfetcher/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.javcoverfetcher"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/megacloud-extractor/build.gradle.kts

@@ -1,21 +1,8 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.megacloudextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:cryptoaes"))
-    implementation(project(":lib-cryptoaes"))
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }
-// BUMPS: 0

lib/mixdrop-extractor/build.gradle.kts

@@ -1,18 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.mixdropextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:unpacker"))
-    implementation(project(":lib-unpacker"))
 }

lib/mp4upload-extractor/build.gradle.kts

@@ -1,20 +1,9 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.mp4uploadextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    compileOnly(libs.bundles.common)
 }

lib/okru-extractor/build.gradle.kts

@@ -1,18 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.okruextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }

lib/playlist-utils/build.gradle.kts

@@ -1,18 +1,3 @@
-
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.playlistutils"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/sendvid-extractor/build.gradle.kts

@@ -1,18 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.sendvidextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }

lib/sibnet-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.sibnetextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/streamdav-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamdavextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/streamhidevid-extractor/build.gradle.kts

@@ -1,19 +1,8 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamhidevidextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }

lib/streamhub-extractor/build.gradle.kts

@@ -1,18 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamhubextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
-    compileOnly(libs.bundles.common)
 }

lib/streamlare-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamlareextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/streamtape-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamtapeextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/streamvid-extractor/build.gradle.kts

@@ -1,21 +1,10 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamvidextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    compileOnly(libs.bundles.common)
 }

lib/streamwish-extractor/build.gradle.kts

@@ -1,21 +1,10 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.streamwishextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
-    compileOnly(libs.bundles.common)
 }

lib/synchrony/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.synchrony"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/unpacker/build.gradle.kts

@@ -1,10 +1,5 @@
 plugins {
-    `java-library`
+    id("lib-kotlin")
-    kotlin("jvm")
-}
-
-dependencies {
-    compileOnly(libs.kotlin.stdlib)
 }
 
 java {

lib/upstream-extractor/build.gradle.kts

@@ -1,20 +1,9 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.upstreamextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }

lib/uqload-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.uqloadextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/vidbom-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.vidbomextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/vido-extractor/build.gradle.kts

@@ -1,21 +1,10 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.vidoextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }
-    compileOnly(libs.bundles.common)
 }

lib/vidsrc-extractor/build.gradle.kts

@@ -1,20 +1,7 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-    id("kotlinx-serialization")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.vidsrcextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
 }
 
 dependencies {
-    compileOnly(libs.bundles.common)
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-playlist-utils"))
 }
-// BUMPS: 0

lib/vk-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.vkextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/voe-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.voeextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/vudeo-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.vudeoextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

lib/yourupload-extractor/build.gradle.kts

@@ -1,17 +1,3 @@
 plugins {
-    id("com.android.library")
+    id("lib-android")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.youruploadextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
 }

multisrc/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     // Note that this does not mean that generated sources are going to
     // implement them too; this is just to be able to compile and generate sources.
     rootProject.subprojects
-        .filter { it.path.startsWith(":lib") }
+        .filter { it.path.startsWith(":lib:") }
         .forEach(::implementation)
 }
 

multisrc/overrides/animestream/animebalkan/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
-    implementation(project(":lib-googledrive-extractor"))
+    implementation(project(":lib:googledrive-extractor"))
 }

multisrc/overrides/animestream/animeindo/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(project(":lib-mp4upload-extractor"))
+    implementation(project(":lib:mp4upload-extractor"))
-    implementation(project(":lib-gdriveplayer-extractor"))
+    implementation(project(":lib:gdriveplayer-extractor"))
-    implementation(project(":lib-streamtape-extractor"))
+    implementation(project(":lib:streamtape-extractor"))
-    implementation(project(":lib-yourupload-extractor"))
+    implementation(project(":lib:yourupload-extractor"))
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
 }

multisrc/overrides/animestream/animekhor/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

multisrc/overrides/animestream/animenosub/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

multisrc/overrides/animestream/animexin/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(project(':lib-dailymotion-extractor'))
+    implementation(project(':lib:dailymotion-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-gdriveplayer-extractor'))
+    implementation(project(':lib:gdriveplayer-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

multisrc/overrides/animestream/animeytes/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
-    implementation(project(":lib-streamtape-extractor"))
+    implementation(project(":lib:streamtape-extractor"))
-    implementation(project(":lib-sendvid-extractor"))
+    implementation(project(":lib:sendvid-extractor"))
 }

multisrc/overrides/animestream/asyaanimeleri/additional.gradle

@@ -1,8 +1,8 @@
 dependencies {
-    implementation(project(":lib-vk-extractor"))
+    implementation(project(":lib:vk-extractor"))
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
-    implementation(project(":lib-sibnet-extractor"))
+    implementation(project(":lib:sibnet-extractor"))
-    implementation(project(":lib-gdriveplayer-extractor"))
+    implementation(project(":lib:gdriveplayer-extractor"))
-    implementation(project(":lib-dood-extractor"))
+    implementation(project(":lib:dood-extractor"))
-    // implementation(project(":lib-dailymotion-extractor"))
+    // implementation(project(":lib:dailymotion-extractor"))
 }

multisrc/overrides/animestream/chineseanime/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(":lib-dailymotion-extractor"))
+    implementation(project(":lib:dailymotion-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/animestream/desuonline/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-googledrive-extractor'))
+    implementation(project(':lib:googledrive-extractor'))
-    implementation(project(':lib-sibnet-extractor'))
+    implementation(project(':lib:sibnet-extractor'))
 }

multisrc/overrides/animestream/donghuastream/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(':lib-dailymotion-extractor'))
+    implementation(project(':lib:dailymotion-extractor'))
-    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib:playlist-utils'))
 }

multisrc/overrides/animestream/lmanime/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(":lib-dailymotion-extractor"))
+    implementation(project(":lib:dailymotion-extractor"))
-    implementation(project(":lib-mp4upload-extractor"))
+    implementation(project(":lib:mp4upload-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
 }

multisrc/overrides/animestream/luciferdonghua/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(':lib-dailymotion-extractor'))
+    implementation(project(':lib:dailymotion-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
 }

multisrc/overrides/animestream/minioppai/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-gdriveplayer-extractor"))
+    implementation(project(":lib:gdriveplayer-extractor"))
-    implementation(project(":lib-unpacker"))
+    implementation(project(":lib:unpacker"))
 }

multisrc/overrides/animestream/rinecloud/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-unpacker"))
+    implementation(project(":lib:unpacker"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/animestream/tiodonghua/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
 
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
-    implementation(project(":lib-mixdrop-extractor"))
+    implementation(project(":lib:mixdrop-extractor"))
-    implementation(project(":lib-voe-extractor"))
+    implementation(project(":lib:voe-extractor"))
-    implementation(project(":lib-yourupload-extractor"))
+    implementation(project(":lib:yourupload-extractor"))
 }

multisrc/overrides/datalifeengine/frenchanime/additional.gradle

@@ -1,12 +1,12 @@
 dependencies {
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-vido-extractor'))
+    implementation(project(':lib:vido-extractor'))
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-vudeo-extractor'))
+    implementation(project(':lib:vudeo-extractor'))
-    implementation(project(':lib-streamhidevid-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib:upstream-extractor'))
-    implementation(project(':lib-streamvid-extractor'))
+    implementation(project(':lib:streamvid-extractor'))
-    implementation(project(':lib-sibnet-extractor'))
+    implementation(project(':lib:sibnet-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-streamhub-extractor'))
+    implementation(project(':lib:streamhub-extractor'))
 }

multisrc/overrides/datalifeengine/wiflix/additional.gradle

@@ -1,11 +1,11 @@
 dependencies {
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-vido-extractor'))
+    implementation(project(':lib:vido-extractor'))
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-streamdav-extractor'))
+    implementation(project(':lib:streamdav-extractor'))
-    // ? implementation(project(':lib-waaw1-extractor'))
+    // ? implementation(project(':lib:waaw1-extractor'))
-    implementation(project(':lib-vudeo-extractor'))
+    implementation(project(':lib:vudeo-extractor'))
-    implementation(project(':lib-streamhidevid-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib:upstream-extractor'))
-    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib:voe-extractor'))
 }

multisrc/overrides/dooplay/animeonlineninja/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
-    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
 }

multisrc/overrides/dooplay/animeplayer/additional.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-blogger-extractor"))
+    implementation(project(":lib:blogger-extractor"))
 }

multisrc/overrides/dooplay/animesaga/additional.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-chillx-extractor"))
+    implementation(project(":lib:chillx-extractor"))
 }

multisrc/overrides/dooplay/animesgratis/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(project(":lib-blogger-extractor"))
+    implementation(project(":lib:blogger-extractor"))
-    implementation(project(":lib-filemoon-extractor"))
+    implementation(project(":lib:filemoon-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
-    implementation(project(":lib-mixdrop-extractor"))
+    implementation(project(":lib:mixdrop-extractor"))
-    implementation(project(":lib-streamtape-extractor"))
+    implementation(project(":lib:streamtape-extractor"))
 }

multisrc/overrides/dooplay/animeshouse/additional.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/dooplay/cinemathek/additional.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
 }

multisrc/overrides/dooplay/goanimes/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
-    implementation(project(":lib-blogger-extractor"))
+    implementation(project(":lib:blogger-extractor"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
 }

multisrc/overrides/dooplay/jetanime/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
-    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib:playlist-utils'))
 }

multisrc/overrides/dooplay/kinoking/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
 }

multisrc/overrides/dooplay/multimovies/additional.gradle

@@ -1,8 +1,8 @@
 dependencies {
-    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
-    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
-    implementation(project(':lib-cryptoaes'))
+    implementation(project(':lib:cryptoaes'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

multisrc/overrides/dooplay/pifansubs/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(':lib-streamhidevid-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
 }
 

multisrc/overrides/dooplay/pobreflix/additional.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    implementation(project(":lib-filemoon-extractor"))
+    implementation(project(":lib:filemoon-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
-    implementation(project(":lib-streamtape-extractor"))
+    implementation(project(":lib:streamtape-extractor"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/dooplay/voircartoon/additional.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/dopeflix/default/additional.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(project(":lib-dood-extractor"))
+    implementation(project(":lib:dood-extractor"))
-    implementation(project(":lib-cryptoaes"))
+    implementation(project(":lib:cryptoaes"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

multisrc/overrides/zorotheme/default/additional.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-megacloud-extractor"))
+    implementation(project(":lib:megacloud-extractor"))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
 }

repositories.gradle.kts

@@ -0,0 +1,15 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+        maven(url = "https://jitpack.io")
+    }
+}
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}

settings.gradle.kts

@@ -1,27 +1,13 @@
-dependencyResolutionManagement {
+apply(from = "repositories.gradle.kts")
-    repositories {
-        mavenCentral()
-        google()
-        maven(url = "https://jitpack.io")
-    }
-}
 
 pluginManagement {
-    repositories {
+    includeBuild("build-plugins")
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
 }
 
 include(":core")
 
-// all the directories under /lib instead of manually adding each to a list
+// Load all modules under /lib
-File(rootDir, "lib").eachDir {
+File(rootDir, "lib").eachDir { include("lib:${it.name}") }
-    val libName = it.name
-    include(":lib-$libName")
-    project(":lib-$libName").projectDir = File("lib/$libName")
-}
 
 // Fix deprecation warnings with Gradle 8.5+.
 // See https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory
@@ -43,34 +29,14 @@ if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") {
     include(":multisrc")
     project(":multisrc").projectDir = File("multisrc")
 
-    // Loads all extensions
-    File(rootDir, "src").eachDir { dir ->
-        dir.eachDir { subdir ->
-            val name = ":extensions:individual:${dir.name}:${subdir.name}"
-            include(name)
-            project(name).projectDir = File("src/${dir.name}/${subdir.name}")
-        }
-    }
-    // Loads all generated extensions from multisrc
-    File(rootDir, "generated-src").eachDir { dir ->
-        dir.eachDir { subdir ->
-            val name = ":extensions:multisrc:${dir.name}:${subdir.name}"
-            include(name)
-            project(name).projectDir = File("generated-src/${dir.name}/${subdir.name}")
-        }
-    }
-
     /**
-     * If you're developing locally and only want to work with a single module,
+     * Add or remove modules to load as needed for local development here.
-     * comment out the parts above and uncomment below.
+     * To generate multisrc extensions first, run the `:multisrc:generateExtensions` task first.
      */
-//    val lang = "all"
+    loadAllIndividualExtensions()
-//    val name = "mangadex"
+    loadAllGeneratedMultisrcExtensions()
-//    val projectName = ":extensions:individual:$lang:$name"
+    // loadIndividualExtension("all", "jellyfin")
-//    val projectName = ":extensions:multisrc:$lang:$name"
+    // loadGeneratedMultisrcExtension("en", "aniwatch")
-//    include(projectName)
-//    project(projectName).projectDir = File("src/${lang}/${name}")
-//    project(projectName).projectDir = File("generated-src/${lang}/${name}")
 } else {
     // Running in CI (GitHub Actions)
 
@@ -82,24 +48,47 @@ if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") {
         include(":multisrc")
         project(":multisrc").projectDir = File("multisrc")
 
-        // Loads all generated extensions from multisrc
+        // Loads generated extensions from multisrc
         File(rootDir, "generated-src").getChunk(chunk, chunkSize)?.forEach {
-            val name = ":extensions:multisrc:${it.parentFile.name}:${it.name}"
+            loadGeneratedMultisrcExtension(it.parentFile.name, it.name, log = true)
-            println(name)
-            include(name)
-            project(name).projectDir = File("generated-src/${it.parentFile.name}/${it.name}")
         }
     } else {
         // Loads individual extensions
         File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach {
-            val name = ":extensions:individual:${it.parentFile.name}:${it.name}"
+            loadIndividualExtension(it.parentFile.name, it.name, log = true)
-            println(name)
-            include(name)
-            project(name).projectDir = File("src/${it.parentFile.name}/${it.name}")
         }
     }
 }
 
+fun loadAllIndividualExtensions() {
+    File(rootDir, "src").eachDir { lang ->
+        lang.eachDir { extension ->
+            loadIndividualExtension(lang.name, extension.name)
+        }
+    }
+}
+fun loadAllGeneratedMultisrcExtensions() {
+    File(rootDir, "generated-src").eachDir { lang ->
+        lang.eachDir { extension ->
+            loadGeneratedMultisrcExtension(lang.name, extension.name)
+        }
+    }
+}
+
+fun loadIndividualExtension(lang: String, name: String, log: Boolean = false) {
+    val projectName = ":extensions:individual:$lang:$name"
+    if (log) println(projectName)
+    include(projectName)
+    project(projectName).projectDir = File("src/$lang/$name")
+}
+
+fun loadGeneratedMultisrcExtension(lang: String, name: String, log: Boolean = false) {
+    val projectName = ":extensions:multisrc:$lang:$name"
+    if (log) println(projectName)
+    include(projectName)
+    project(projectName).projectDir = File("generated-src/$lang/$name")
+}
+
 fun File.getChunk(chunk: Int, chunkSize: Int): List<File>? {
     return listFiles()
         // Lang folder

src/all/animeworldindia/build.gradle

@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

src/all/googledrive/build.gradle

@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-googledrive-extractor'))
+    implementation(project(':lib:googledrive-extractor'))
 }

src/all/javguru/build.gradle

@@ -8,11 +8,11 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
-    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib:playlist-utils'))
-    implementation(project(':lib-javcoverfetcher'))
+    implementation(project(':lib:javcoverfetcher'))
 }

src/all/missav/build.gradle

@@ -8,7 +8,7 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-unpacker'))
+    implementation(project(':lib:unpacker'))
-    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib:playlist-utils'))
-    implementation(project(':lib-javcoverfetcher'))
+    implementation(project(':lib:javcoverfetcher'))
 }

src/all/supjav/build.gradle

@@ -8,8 +8,8 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-streamtape-extractor"))
+    implementation(project(":lib:streamtape-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
-    implementation(project(":lib-voe-extractor"))
+    implementation(project(":lib:voe-extractor"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
 }

src/ar/anime4up/build.gradle

@@ -7,13 +7,13 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-gdriveplayer-extractor'))
+    implementation(project(':lib:gdriveplayer-extractor'))
-    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
-    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib:voe-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

src/ar/animeblkom/build.gradle

@@ -7,6 +7,6 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
 }

src/ar/animelek/build.gradle

@@ -7,8 +7,8 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
 }

src/ar/animerco/build.gradle

@@ -7,13 +7,13 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-gdriveplayer-extractor'))
+    implementation(project(':lib:gdriveplayer-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
-    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib-yourupload-extractor'))
+    implementation(project(':lib:yourupload-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
 }

src/ar/arabseed/build.gradle

@@ -7,7 +7,7 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-dood-extractor"))
+    implementation(project(":lib:dood-extractor"))
-    implementation(project(":lib-voe-extractor"))
+    implementation(project(":lib:voe-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
 }

src/ar/asia2tv/build.gradle

@@ -7,10 +7,10 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
 }

src/ar/egydead/build.gradle

@@ -7,7 +7,7 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
-    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
 }

src/ar/mycima/build.gradle

@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
 }

src/ar/okanime/build.gradle

@@ -7,9 +7,9 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-dood-extractor"))
+    implementation(project(":lib:dood-extractor"))
-    implementation(project(":lib-voe-extractor"))
+    implementation(project(":lib:voe-extractor"))
-    implementation(project(":lib-okru-extractor"))
+    implementation(project(":lib:okru-extractor"))
-    implementation(project(":lib-vidbom-extractor"))
+    implementation(project(":lib:vidbom-extractor"))
-    implementation(project(":lib-mp4upload-extractor"))
+    implementation(project(":lib:mp4upload-extractor"))
 }

src/ar/tuktukcinema/build.gradle

@@ -7,11 +7,11 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
-    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib:playlist-utils'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }

src/ar/witanime/build.gradle

@@ -7,9 +7,9 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-dailymotion-extractor'))
+    implementation(project(':lib:dailymotion-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
-    implementation(project(':lib-vidbom-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
 }

src/de/aniflix/build.gradle

@@ -7,8 +7,8 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
-    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
 }

src/de/aniking/build.gradle

@@ -7,6 +7,6 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib:dood-extractor'))
 }

src/de/animebase/build.gradle

@@ -8,8 +8,8 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-voe-extractor"))
+    implementation(project(":lib:voe-extractor"))
-    implementation(project(":lib-streamwish-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
-    implementation(project(":lib-playlist-utils"))
+    implementation(project(":lib:playlist-utils"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
 }