fix: random ahh circular dependency when pushing to jitpack

flixclusiveorg · Feb 11, 2024 · d31c10d · d31c10d
1 parent 64d944f
commit d31c10d
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 122 deletions.
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -56,10 +56,6 @@ gradlePlugin {
             id = "flixclusive.destinations"
             implementationClass = "DestinationsConventionPlugin"
         }
-        register("flixclusiveExtractor") {
-            id = "flixclusive.extractor"
-            implementationClass = "ExtractorConventionPlugin"
-        }
         register("flixclusiveProvider") {
             id = "flixclusive.provider"
             implementationClass = "ProviderConventionPlugin"

diff --git a/build-logic/convention/src/main/kotlin/ExtractorConventionPlugin.kt b/build-logic/convention/src/main/kotlin/ExtractorConventionPlugin.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,14 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.room) apply false
     id("com.osacky.doctor") version "0.9.1"
-    id("maven-publish")
+}
+
+subprojects {
+    val moduleGroup = if (group.toString().contains(rootProject.name, true).not()) {
+        path.substringBeforeLast(":").replace(":", ".")
+    } else ""
+
+    group = "$group$moduleGroup"
 }
 
 // Generate a mf FAT AHH JAR!
@@ -66,34 +73,4 @@ tasks.register<Jar>("generateStubsJar") {
             }
         }
     }
-}
-
-
-
-subprojects {
-    apply(plugin = "maven-publish")
-
-    if (subprojects.size == 0) {
-        val publishingGroup = "com.github.rhenwinch"
-        this.group = this.group.toString().replace(rootProject.name, publishingGroup)
-
-        publishing {
-            repositories {
-                mavenLocal()
-
-                val token = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
-
-                if (token != null) {
-                    maven {
-                        credentials {
-                            username = "rhenwinch"
-                            password = token
-                        }
-                        setUrl("https://maven.pkg.github.com/rhenwinch/flixclusive")
-                    }
-                }
-            }
-        }
-    }
-
 }
diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.flixclusive.library)
     alias(libs.plugins.flixclusive.hilt)
     alias(libs.plugins.flixclusive.compose)
+    `maven-publish`
 }
 
 android {
@@ -17,4 +18,24 @@ dependencies {
     implementation(libs.jsoup)
     implementation(libs.okhttp.dnsoverhttps)
     implementation(libs.retrofit)
+}
+
+afterEvaluate {
+    publishing {
+        repositories {
+            mavenLocal()
+
+            val token = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+
+            if (token != null) {
+                maven {
+                    credentials {
+                        username = "rhenwinch"
+                        password = token
+                    }
+                    setUrl("https://maven.pkg.github.com/rhenwinch/Flixclusive")
+                }
+            }
+        }
+    }
 }
diff --git a/extractor/base/.gitignore b/extractor/base/.gitignore
diff --git a/extractor/base/build.gradle.kts b/extractor/base/build.gradle.kts
diff --git a/extractor/mixdrop/build.gradle.kts b/extractor/mixdrop/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.flixclusive.extractor)
+    alias(libs.plugins.flixclusive.provider)
 }
 
 android {

diff --git a/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/MixDrop.kt b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/MixDrop.kt
@@ -2,7 +2,7 @@ package com.flixclusive.extractor.mixdrop
 
 import com.flixclusive.core.util.network.asJsoup
 import com.flixclusive.core.util.network.request
-import com.flixclusive.extractor.base.Extractor
+import com.flixclusive.provider.base.extractor.Extractor
 import com.flixclusive.extractor.mixdrop.util.Unpacker
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle

diff --git a/extractor/upcloud/build.gradle.kts b/extractor/upcloud/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.flixclusive.extractor)
+    alias(libs.plugins.flixclusive.provider)
 }
 
 android {

diff --git a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt
@@ -7,14 +7,14 @@ import com.flixclusive.core.util.log.debugLog
 import com.flixclusive.core.util.network.CryptographyUtil.decryptAes
 import com.flixclusive.core.util.network.fromJson
 import com.flixclusive.core.util.network.request
-import com.flixclusive.extractor.base.Extractor
 import com.flixclusive.extractor.upcloud.dto.DecryptedSource
 import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData
 import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData.Companion.toSubtitle
 import com.flixclusive.extractor.upcloud.util.DecryptUtils.extractEmbedDecryptionDetails
 import com.flixclusive.extractor.upcloud.util.DecryptUtils.getKeyStops
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.extractor.Extractor
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import java.net.URL

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -184,7 +184,6 @@ room = { id = "androidx.room", version.ref = "room" }
 flixclusive-application = { id = "flixclusive.android.application", version = "unspecified" }
 flixclusive-compose = { id = "flixclusive.compose", version = "unspecified" }
 flixclusive-destinations = { id = "flixclusive.destinations", version = "unspecified" }
-flixclusive-extractor = { id = "flixclusive.extractor", version = "unspecified" }
 flixclusive-feature = { id = "flixclusive.feature", version = "unspecified" }
 flixclusive-hilt = { id = "flixclusive.hilt", version = "unspecified" }
 flixclusive-library = { id = "flixclusive.android.library", version = "unspecified" }

diff --git a/provider/base/build.gradle.kts b/provider/base/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.flixclusive.library)
     alias(libs.plugins.flixclusive.testing)
+    `maven-publish`
 }
 
 android {
@@ -12,9 +13,29 @@ dependencies {
     api(libs.jsoup)
     api(libs.okhttp)
     api(projects.core.util)
-    api(projects.extractor.base)
+    api(projects.model.provider)
 
     implementation(libs.coroutines.test)
     implementation(libs.junit)
     implementation(libs.mockk)
-}
+}
+
+afterEvaluate {
+    publishing {
+        repositories {
+            mavenLocal()
+
+            val token = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+
+            if (token != null) {
+                maven {
+                    credentials {
+                        username = "rhenwinch"
+                        password = token
+                    }
+                    setUrl("https://maven.pkg.github.com/rhenwinch/Flixclusive")
+                }
+            }
+        }
+    }
+}
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/Provider.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/Provider.kt
@@ -1,11 +1,11 @@
 package com.flixclusive.provider.base
 
 import com.flixclusive.core.util.film.FilmType
-import com.flixclusive.extractor.base.Extractor
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
 import com.flixclusive.provider.base.dto.FilmInfo
 import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.provider.base.extractor.Extractor
 import okhttp3.OkHttpClient
 
 /**

diff --git a/...m/flixclusive/extractor/base/Extractor.kt → ...sive/provider/base/extractor/Extractor.kt b/...m/flixclusive/extractor/base/Extractor.kt → ...sive/provider/base/extractor/Extractor.kt
@@ -1,41 +1,41 @@
-package com.flixclusive.extractor.base
-
-import com.flixclusive.model.provider.SourceLink
-import com.flixclusive.model.provider.Subtitle
-import java.net.URL
-
-/**
- * An extractor class for providers that contains embeds.
- */
-abstract class Extractor {
-    /**
-     * The name of the extractor.
-     */
-    abstract val name: String
-
-    /**
-     * Alternate names for the extractor. Defaults to an empty list.
-     */
-    open val alternateNames: List<String> = emptyList()
-
-    /**
-     * The host associated with the extractor.
-     */
-    abstract val host: String
-
-    /**
-     * Extracts source links and subtitles from the provided URL.
-     * @param url The URL to extract from.
-     * @param mediaId The ID of the media.
-     * @param episodeId The ID of the episode.
-     * @param onLinkLoaded A callback function invoked when a source link is loaded.
-     * @param onSubtitleLoaded A callback function invoked when a subtitle is loaded.
-     */
-    abstract suspend fun extract(
-        url: URL,
-        mediaId: String,
-        episodeId: String,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    )
-}
+package com.flixclusive.provider.base.extractor
+
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import java.net.URL
+
+/**
+ * An extractor class for providers that contains embeds.
+ */
+abstract class Extractor {
+    /**
+     * The name of the extractor.
+     */
+    abstract val name: String
+
+    /**
+     * Alternate names for the extractor. Defaults to an empty list.
+     */
+    open val alternateNames: List<String> = emptyList()
+
+    /**
+     * The host associated with the extractor.
+     */
+    abstract val host: String
+
+    /**
+     * Extracts source links and subtitles from the provided URL.
+     * @param url The URL to extract from.
+     * @param mediaId The ID of the media.
+     * @param episodeId The ID of the episode.
+     * @param onLinkLoaded A callback function invoked when a source link is loaded.
+     * @param onSubtitleLoaded A callback function invoked when a subtitle is loaded.
+     */
+    abstract suspend fun extract(
+        url: URL,
+        mediaId: String,
+        episodeId: String,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    )
+}
diff --git a/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt
@@ -4,14 +4,14 @@ import com.flixclusive.core.util.coroutines.mapAsync
 import com.flixclusive.core.util.film.FilmType
 import com.flixclusive.core.util.network.fromJson
 import com.flixclusive.core.util.network.request
-import com.flixclusive.extractor.base.Extractor
 import com.flixclusive.extractor.upcloud.VidCloud
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
 import com.flixclusive.provider.base.Provider
 import com.flixclusive.provider.base.dto.FilmInfo
 import com.flixclusive.provider.base.dto.SearchResultItem
 import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.provider.base.extractor.Extractor
 import com.flixclusive.provider.base.util.TvShowCacheData
 import com.flixclusive.provider.base.util.replaceWhitespaces
 import com.flixclusive.provider.flixhq.dto.FlixHQInitialSourceData

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -74,7 +74,6 @@ include(":data:user")
 include(":data:watch_history")
 include(":data:watchlist")
 
-include(":extractor:base")
 include(":extractor:mixdrop")
 include(":extractor:upcloud")