Luna712 · Luna712 · Nov 23, 2025 · Nov 23, 2025 · Nov 23, 2025 · Nov 23, 2025
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -24,10 +24,56 @@ jobs:
         cache-read-only: false
 
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug
+      run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v6
       with:
         name: pull-request-build
-        path: "app/build/outputs/apk/prerelease/debug/*.apk"
+        path: |
+          app/build/outputs/apk/prerelease/debug/*.apk
+          app/build/outputs/apk/prerelease/release/*.apk
+          app/build/libs/app-sources.jar
+          app/build/classes.jar
+          library/build/libs/library-*-sources.jar
+
+    - name: Deploy Reports to GitHub Pages
+      run: |
+        BRANCH_NAME=${GITHUB_REF#refs/heads/}
+        TARGET_DIR=gh-pages/$BRANCH_NAME
+        mkdir -p "$TARGET_DIR"
+        if [ -d "build/reports" ]; then
+          cp -r build/reports/. "$TARGET_DIR/"
+        fi
+        for REPORT_DIR in */build/reports; do
+          if [ -d "$REPORT_DIR" ]; then
+            cp -r "$REPORT_DIR/." "$TARGET_DIR/"
+          fi
+        done
+        INDEX_FILE="$TARGET_DIR/index.html"
+        echo "<!DOCTYPE html>
+        <html>
+          <head>
+            <meta charset='UTF-8'>
+            <title>Reports for $BRANCH_NAME</title>
+          </head>
+          <body>
+            <h1>Reports for branch $BRANCH_NAME</h1>
+            <ul>" > "$INDEX_FILE"
+        find "$TARGET_DIR" -type f -name "*.html" | while read FILE; do
+          REL_PATH="${FILE#$TARGET_DIR/}"
+          echo "    <li><a href=\"$REL_PATH\">$REL_PATH</a></li>" >> "$INDEX_FILE"
+        done
+        echo "  </ul>
+          </body>
+        </html>" >> "$INDEX_FILE"
+      shell: bash
+
+    - name: Push to GitHub Pages
+      uses: peaceiris/actions-gh-pages@v4
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./gh-pages
+        user_name: "github-actions"
+        user_email: "github-actions@github.com"
+        commit_message: "Update reports for ${{ github.ref_name }} [ci skip]"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import com.android.build.gradle.tasks.MergeSourceSetFolders
 import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
 import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
@@ -7,31 +8,49 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.kotlin.android)
+    // alias(libs.plugins.dokka)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
-
-fun getGitCommitHash(): String {
-    return try {
-        val headFile = file("${project.rootDir}/.git/HEAD")
-
-        // Read the commit hash from .git/HEAD
-        if (headFile.exists()) {
-            val headContent = headFile.readText().trim()
-            if (headContent.startsWith("ref:")) {
-                val refPath = headContent.substring(5) // e.g., refs/heads/main
-                val commitFile = file("${project.rootDir}/.git/$refPath")
-                if (commitFile.exists()) commitFile.readText().trim() else ""
-            } else headContent // If it's a detached HEAD (commit hash directly)
-        } else {
-            "" // If .git/HEAD doesn't exist
-        }.take(7) // Return the short commit hash
-    } catch (_: Throwable) {
-        "" // Just return an empty string if any exception occurs
+
+tasks.register("generateGitHash") {
+    val gitHashDir = layout.buildDirectory.dir("generated/git")
+    val rootDir = project.rootDir
+    outputs.dir(gitHashDir)
+
+    doLast {
+        val hash = try {
+            // Read the commit hash from .git/HEAD
+            val headFile = File(rootDir, ".git/HEAD")
+            if (headFile.exists()) {
+                val headContent = headFile.readText().trim()
+                if (headContent.startsWith("ref:")) {
+                    val refPath = headContent.substring(5) // e.g., refs/heads/main
+                    val commitFile = File(rootDir, ".git/$refPath")
+                    if (commitFile.exists()) commitFile.readText().trim() else ""
+                } else headContent // If it's a detached HEAD (commit hash directly)
+            } else "" // If .git/HEAD doesn't exist
+        } catch (_: Throwable) {
+            "" // Just set to an empty string if any exception occurs
+        }.take(7) // Get the short commit hash
+
+        val outFile = gitHashDir.get().file("git-hash.txt").asFile
+        outFile.parentFile.mkdirs()
+        outFile.writeText(hash)
+    }
+}
+
+tasks.withType<MergeSourceSetFolders> {
+    if (name.contains("Assets", ignoreCase = true)) {
+        dependsOn("generateGitHash")
+        val gitHashDir = layout.buildDirectory.dir("generated/git")
+
+        doLast {
+            val assetsDir = outputs.files.singleFile
+            val gitHashFile = gitHashDir.get().file("git-hash.txt").asFile
+            val outFile = File(assetsDir, "git-hash.txt")
+            gitHashFile.copyTo(outFile, overwrite = true)
+        }
     }
 }
 
@@ -46,9 +65,14 @@ android {
     }
 
     signingConfigs {
-        if (prereleaseStoreFile != null) {
+        // We just use SIGNING_KEY_ALIAS here since it won't change
+        // so won't kill the configuration cache.
+        if (System.getenv("SIGNING_KEY_ALIAS") != null) {
             create("prerelease") {
-                storeFile = file(prereleaseStoreFile)
+                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+                val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+                storeFile = prereleaseStoreFile?.let { file(it) }
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
                 keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
@@ -65,8 +89,6 @@ android {
         versionCode = 67
         versionName = "4.6.1"
 
-        resValue("string", "commit_hash", getGitCommitHash())
-
         manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
         // Reads local.properties
@@ -135,26 +157,34 @@ android {
     }
 
     java {
-	    // Use Java 17 toolchain even if a higher JDK runs the build.
+        // Use Java 17 toolchain even if a higher JDK runs the build.
         // We still use Java 8 for now which higher JDKs have deprecated.
-	    toolchain {
-		    languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
-    	}
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+        }
     }
 
     lint {
-        abortOnError = false
         checkReleaseBuilds = false
     }
 
     buildFeatures {
         buildConfig = true
-        resValues = true
     }
 
     namespace = "com.lagradost.cloudstream3"
 }
 
+androidComponents {
+    // Make sure lint runs when running debug builds
+    onVariants(selector().withBuildType("debug")) { variant ->
+        val variantName = variant.name.replaceFirstChar { it.uppercase() }
+        tasks.matching { it.name == "assemble$variantName" }.configureEach {
+            dependsOn("lint", ":library:lint")
+        }
+    }
+}
+
 dependencies {
     // Testing
     testImplementation(libs.junit)
@@ -271,7 +301,7 @@ tasks.withType<KotlinJvmCompile> {
     }
 }
 
-dokka {
+/*dokka {
     moduleName = "App"
     dokkaSourceSets {
         main {
@@ -288,4 +318,4 @@ dokka {
             }
         }
     }
-}
+}*/
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -27,6 +27,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
@@ -247,16 +248,17 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
         }
 
         val appVersion = BuildConfig.VERSION_NAME
-        val commitInfo = getString(R.string.commit_hash)
+        val commitHash = activity?.currentCommitHash() ?: ""
         val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
         }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
 
         binding.appVersion.text = appVersion
         binding.buildDate.text = buildTimestamp
+        binding.commitHash.text = commitHash
         binding.appVersionInfo.setOnLongClickListener {
-            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo $buildTimestamp")
+            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitHash $buildTimestamp")
             true
         }
     }

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt
@@ -0,0 +1,20 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+
+/**
+ * Simple helper to get the short commit hash from assets.
+ * The hash is generated at build and stored as an asset
+ * that can be accessed at runtime for Gradle
+ * configuration cache support.
+ */
+object GitInfo {
+    fun Context.currentCommitHash(): String = try {
+        assets.open("git-hash.txt")
+            .bufferedReader()
+            .readText()
+            .trim()
+    } catch (_: Exception) {
+        ""
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -24,6 +24,7 @@ import com.lagradost.cloudstream3.services.PackageInstallerService
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okio.BufferedSink
@@ -170,7 +171,7 @@ object InAppUpdater {
         Log.d(LOG_TAG, "Fetched GitHub tag: $updateCommitHash")
 
         return Update(
-            getString(R.string.commit_hash) != updateCommitHash,
+            currentCommitHash() != updateCommitHash,
             foundAsset.browserDownloadUrl,
             updateCommitHash,
             found.body,

diff --git a/app/src/main/res/layout/main_settings.xml b/app/src/main/res/layout/main_settings.xml
@@ -134,8 +134,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="@string/commit_hash"
-                    android:textColor="?attr/textColor" />
+                    android:textColor="?attr/textColor"
+                    tools:text="1234567" />
 
                 <TextView
                     android:id="@+id/delimiter1"
@@ -150,9 +150,8 @@
                     android:layout_height="wrap_content"
                     android:padding="10dp"
                     android:textColor="?attr/textColor"
-                    tools:text="21/03/2024 09:02 pm"/>
+                    tools:text="21/03/2024 09:02 pm" />
             </LinearLayout>
-
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     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
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
 activityKtx = "1.11.0"
-androidGradlePlugin = "8.13.2"
+androidGradlePlugin = "9.0.0"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha04"
 buildkonfigGradlePlugin = "0.17.1"
@@ -119,7 +119,6 @@ android-lint = { id = "com.android.lint", 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" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlugin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }