From 6f7a8b5eeff94eed7f5bfcd75adcdd8b3426f7ed Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:26:52 -0600 Subject: [PATCH 01/23] Test --- .../main/kotlin/com/example/BlankFragment.kt | 77 +++++-------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt index 3d35a883cf..3c45d4d763 100644 --- a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt +++ b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt @@ -4,24 +4,21 @@ import android.annotation.SuppressLint import android.content.res.ColorStateList import android.graphics.drawable.Drawable import android.os.Build -import android.os.Bundle -import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.annotation.RequiresApi import androidx.core.content.res.ResourcesCompat import androidx.core.widget.TextViewCompat -import androidx.fragment.app.Fragment -import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.lagradost.cloudstream3.R +import com.lagradost.cloudstream3.databinding.FragmentBlankBinding +import com.lagradost.cloudstream3.ui.BaseBottomSheetDialogFragment +import com.lagradost.cloudstream3.ui.BaseFragment import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute /** * A simple [Fragment] subclass. */ -class BlankFragment(private val plugin: ExamplePlugin) : BottomSheetDialogFragment() { +class BlankFragment(private val plugin: ExamplePlugin) : BaseBottomSheetDialogFragment( + BaseFragment.BindingCreator.Inflate(FragmentBlankBinding::inflate) +) { // Helper function to get a drawable resource by name @SuppressLint("DiscouragedApi") @@ -34,61 +31,29 @@ class BlankFragment(private val plugin: ExamplePlugin) : BottomSheetDialogFragme // Helper function to get a string resource by name @SuppressLint("DiscouragedApi") @Suppress("SameParameterValue") - private fun getString(name: String): String? { + private fun getStringRes(name: String): String? { val id = plugin.resources?.getIdentifier(name, "string", BuildConfig.LIBRARY_PACKAGE_NAME) return id?.let { plugin.resources?.getString(it) } } - // Generic findView function to find views by name - @SuppressLint("DiscouragedApi") - private fun View.findViewByName(name: String): T? { - val id = plugin.resources?.getIdentifier(name, "id", BuildConfig.LIBRARY_PACKAGE_NAME) - return findViewById(id ?: return null) - } - - @SuppressLint("DiscouragedApi") - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - val layoutId = plugin.resources?.getIdentifier("fragment_blank", "layout", BuildConfig.LIBRARY_PACKAGE_NAME) - return layoutId?.let { - inflater.inflate(plugin.resources?.getLayout(it), container, false) - } + override fun fixPadding(view: View) { + // Don't need any padding here } - @RequiresApi(Build.VERSION_CODES.M) - override fun onViewCreated( - view: View, - savedInstanceState: Bundle? - ) { - super.onViewCreated(view, savedInstanceState) + override fun onBindingCreated(binding: FragmentBlankBinding) { + binding.apply { + // Set text + textView.text = getStringRes("hello_fragment") + TextViewCompat.setTextAppearance(textView, R.style.ResultInfoText) - // Initialize views - val imageView: ImageView? = view.findViewByName("imageView") - val imageView2: ImageView? = view.findViewByName("imageView2") - val textView: TextView? = view.findViewByName("textView") - val textView2: TextView? = view.findViewByName("textView2") + textView2.text = root.context.resources.getText(R.string.legal_notice_text) - // Set text and styling if the views are found - textView?.apply { - text = getString("hello_fragment") - TextViewCompat.setTextAppearance(this, R.style.ResultInfoText) - } - - textView2?.text = view.context.resources.getText(R.string.legal_notice_text) - - // Set image resources and tint if the views are found - imageView?.apply { - setImageDrawable(getDrawable("ic_android_24dp")) - imageTintList = ColorStateList.valueOf(view.context.getColor(R.color.white)) - } + // Set images + imageView.setImageDrawable(getDrawable("ic_android_24dp")) + imageView.imageTintList = ColorStateList.valueOf(root.context.getColor(R.color.white)) - imageView2?.apply { - setImageDrawable(getDrawable("ic_android_24dp")) - imageTintList = ColorStateList.valueOf(view.context.colorFromAttribute(R.attr.white)) + imageView2.setImageDrawable(getDrawable("ic_android_24dp")) + imageView2.imageTintList = ColorStateList.valueOf(root.context.colorFromAttribute(R.attr.white)) } } -} \ No newline at end of file +} From 0e0ed9d470d5a631bd03e5ae452b3d6ebb229319 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:29:35 -0600 Subject: [PATCH 02/23] Update --- .github/workflows/build.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff32133adb..c91ad44bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ concurrency: cancel-in-progress: true on: - push: + pull_request: branches: # choose your default branch - master @@ -33,9 +33,11 @@ jobs: run: rm $GITHUB_WORKSPACE/builds/*.cs3 - name: Setup JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: 17 + distribution: adopt + cache: gradle - name: Setup Android SDK uses: android-actions/setup-android@v2 @@ -48,11 +50,11 @@ jobs: cp **/build/*.cs3 $GITHUB_WORKSPACE/builds cp build/plugins.json $GITHUB_WORKSPACE/builds - - name: Push builds - run: | - cd $GITHUB_WORKSPACE/builds - git config --local user.email "actions@github.com" - git config --local user.name "GitHub Actions" - git add . - git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit - git push --force + # - name: Push builds + # run: | + # cd $GITHUB_WORKSPACE/builds + # git config --local user.email "actions@github.com" + # git config --local user.name "GitHub Actions" + # git add . + # git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit + # git push --force From 2c3c19708eda793cca6b396ffba450f6e6bd0f04 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:30:40 -0600 Subject: [PATCH 03/23] Update --- ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt index 3c45d4d763..45ecee2f81 100644 --- a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt +++ b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt @@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.ui.BaseFragment import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute /** - * A simple [Fragment] subclass. + * A simple [BaseBottomSheetDialogFragment] subclass. */ class BlankFragment(private val plugin: ExamplePlugin) : BaseBottomSheetDialogFragment( BaseFragment.BindingCreator.Inflate(FragmentBlankBinding::inflate) From c5b3f5012ad473e72e3705fa5dbae08560712ec9 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:35:53 -0600 Subject: [PATCH 04/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index 3270d2912f..f570a91ce3 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -1,6 +1,6 @@ dependencies { - implementation("com.google.android.material:material:1.12.0") - implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("com.google.android.material:material:1.13.0") + implementation("androidx.recyclerview:recyclerview:1.4.0") } // Use an integer for version numbers @@ -31,8 +31,12 @@ cloudstream { } android { + viewBinding { + enable = true + } + buildFeatures { buildConfig = true viewBinding = true } -} \ No newline at end of file +} From 5fad6a7dba9c60ef5dc585845ca119e7ff6ad206 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:47:10 -0600 Subject: [PATCH 05/23] Update build.gradle.kts --- build.gradle.kts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7dc3f4709a..562883c915 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,10 +12,10 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:8.7.3") + classpath("com.android.tools.build:gradle:8.13.0") // Cloudstream gradle plugin which makes everything work and builds plugins classpath("com.github.recloudstream:gradle:-SNAPSHOT") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21") } } @@ -44,10 +44,14 @@ subprojects { android { namespace = "com.example" + viewBinding { + enable = true + } + defaultConfig { minSdk = 21 - compileSdkVersion(35) - targetSdk = 35 + compileSdkVersion(36) + targetSdk = 36 } compileOptions { @@ -78,8 +82,8 @@ subprojects { // but you don't need to include any of them if you don't need them. // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle.kts implementation(kotlin("stdlib")) // Adds Standard Kotlin Features - implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib - implementation("org.jsoup:jsoup:1.18.3") // HTML Parser + implementation("com.github.Blatzar:NiceHttp:0.4.13") // HTTP Lib + implementation("org.jsoup:jsoup:1.21.2") // HTML Parser // IMPORTANT: Do not bump Jackson above 2.13.1, as newer versions will // break compatibility on older Android devices. implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") // JSON Parser @@ -88,4 +92,4 @@ subprojects { task("clean") { delete(rootProject.layout.buildDirectory) -} \ No newline at end of file +} From 2ed5328b5c7c6287a1668567eedec33c905f90b0 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:48:03 -0600 Subject: [PATCH 06/23] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7d960c667c..534c947ea6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME \ No newline at end of file +zipStoreBase=GRADLE_USER_HOME From da8cbb9501cd1f0b38f31b2586605d63c53b908a Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:50:06 -0600 Subject: [PATCH 07/23] Update BlankFragment.kt --- ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt index 45ecee2f81..789767e76b 100644 --- a/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt +++ b/ExampleProvider/src/main/kotlin/com/example/BlankFragment.kt @@ -7,8 +7,8 @@ import android.os.Build import android.view.View import androidx.core.content.res.ResourcesCompat import androidx.core.widget.TextViewCompat +import com.example.databinding.FragmentBlankBinding import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.FragmentBlankBinding import com.lagradost.cloudstream3.ui.BaseBottomSheetDialogFragment import com.lagradost.cloudstream3.ui.BaseFragment import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute From 794b7e7e91a499f548380c4d63be1ec7e7ccd064 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:53:57 -0600 Subject: [PATCH 08/23] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 562883c915..04912d62fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,6 +90,6 @@ subprojects { } } -task("clean") { +tasks.register("clean") { delete(rootProject.layout.buildDirectory) } From 93c573b21011c3db6901fa8e4cb5ecd2940b40d2 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 10:58:02 -0600 Subject: [PATCH 09/23] Update build.gradle.kts --- build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 04912d62fc..c3f454ea38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,10 +44,6 @@ subprojects { android { namespace = "com.example" - viewBinding { - enable = true - } - defaultConfig { minSdk = 21 compileSdkVersion(36) From be1a62547c90744bae73c1993f51fdcb75373107 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:00:33 -0600 Subject: [PATCH 10/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index f570a91ce3..dde8d3c651 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -31,10 +31,6 @@ cloudstream { } android { - viewBinding { - enable = true - } - buildFeatures { buildConfig = true viewBinding = true From 0e4356327c5139a850faf01786a5a5643e7898b1 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:08:52 -0600 Subject: [PATCH 11/23] Create repo.json --- repo.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 repo.json diff --git a/repo.json b/repo.json new file mode 100644 index 0000000000..d94bfcb408 --- /dev/null +++ b/repo.json @@ -0,0 +1,8 @@ +{ + "name": "TestPlugins Fork", + "description": "TestPlugins Fork", + "manifestVersion": 1, + "pluginLists": [ + "https://raw.githubusercontent.com/Luna712/TestPlugins/builds/plugins.json" + ] +} From 50aba8a17146845efe5c77f0dc90c19d434a7ba2 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:09:47 -0600 Subject: [PATCH 12/23] Update build.yml --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c91ad44bb6..8c7c92cefa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,11 +50,11 @@ jobs: cp **/build/*.cs3 $GITHUB_WORKSPACE/builds cp build/plugins.json $GITHUB_WORKSPACE/builds - # - name: Push builds - # run: | - # cd $GITHUB_WORKSPACE/builds - # git config --local user.email "actions@github.com" - # git config --local user.name "GitHub Actions" - # git add . - # git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit - # git push --force + - name: Push builds + run: | + cd $GITHUB_WORKSPACE/builds + git config --local user.email "actions@github.com" + git config --local user.name "GitHub Actions" + git add . + git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit + git push --force From e46b5b5a59903f0259e3aaadf56338c1341f0fdb Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:22:53 -0600 Subject: [PATCH 13/23] test --- build.gradle.kts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index c3f454ea38..52b68b01d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,3 +89,28 @@ subprojects { tasks.register("clean") { delete(rootProject.layout.buildDirectory) } + +tasks.register("includeViewBindingInDex") { + group = "build" + description = "Ensures ViewBinding-generated classes are included in dex." + + val viewBindingDir = layout.buildDirectory.dir("generated/source/viewBinding/debug") + val kotlinOutput = layout.buildDirectory.dir("tmp/kotlin-classes/debug") + val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") + + from(viewBindingDir) + from(kotlinOutput) + into(dexInputDir) + + doLast { + println("Included ViewBinding classes from: ${viewBindingDir.get().asFile}") + } +} + +tasks.named("compileDex") { + dependsOn("includeViewBindingInDex") + doFirst { + val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile + inputs.dir(dexInputDir) + } +} From 83719e48810edd9d5d4bdd29c63757439b6ef5bc Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:25:52 -0600 Subject: [PATCH 14/23] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c7c92cefa..e2d8980018 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: - name: Build Plugins run: | cd $GITHUB_WORKSPACE/src + ls -R . chmod +x gradlew ./gradlew make makePluginsJson cp **/build/*.cs3 $GITHUB_WORKSPACE/builds From b5b99f928453ddb16ce92527ec6ae1c68316dda4 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:26:54 -0600 Subject: [PATCH 15/23] Update build.gradle.kts --- build.gradle.kts | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 52b68b01d9..c3f454ea38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,28 +89,3 @@ subprojects { tasks.register("clean") { delete(rootProject.layout.buildDirectory) } - -tasks.register("includeViewBindingInDex") { - group = "build" - description = "Ensures ViewBinding-generated classes are included in dex." - - val viewBindingDir = layout.buildDirectory.dir("generated/source/viewBinding/debug") - val kotlinOutput = layout.buildDirectory.dir("tmp/kotlin-classes/debug") - val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") - - from(viewBindingDir) - from(kotlinOutput) - into(dexInputDir) - - doLast { - println("Included ViewBinding classes from: ${viewBindingDir.get().asFile}") - } -} - -tasks.named("compileDex") { - dependsOn("includeViewBindingInDex") - doFirst { - val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile - inputs.dir(dexInputDir) - } -} From fa9dc12bb2d7558f3661b0b6b919a79b0de19ced Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:28:15 -0600 Subject: [PATCH 16/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index dde8d3c651..eeeb7d9caa 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -36,3 +36,28 @@ android { viewBinding = true } } + +tasks.register("includeViewBindingInDex") { + group = "build" + description = "Ensures ViewBinding-generated classes are included in dex." + + val viewBindingDir = layout.buildDirectory.dir("generated/source/viewBinding/debug") + val kotlinOutput = layout.buildDirectory.dir("tmp/kotlin-classes/debug") + val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") + + from(viewBindingDir) + from(kotlinOutput) + into(dexInputDir) + + doLast { + println("Included ViewBinding classes from: ${viewBindingDir.get().asFile}") + } +} + +tasks.named("compileDex") { + dependsOn("includeViewBindingInDex") + doFirst { + val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile + inputs.dir(dexInputDir) + } +} From 438467ae5c7dd604c648414141edfc6338524227 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:33:56 -0600 Subject: [PATCH 17/23] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d8980018..f8923254ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,9 +45,9 @@ jobs: - name: Build Plugins run: | cd $GITHUB_WORKSPACE/src - ls -R . chmod +x gradlew ./gradlew make makePluginsJson + ls -R . cp **/build/*.cs3 $GITHUB_WORKSPACE/builds cp build/plugins.json $GITHUB_WORKSPACE/builds From 057a1d8fcc81a68b9fc78abd9025ecb11c05b383 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:34:29 -0600 Subject: [PATCH 18/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index eeeb7d9caa..0c685f5965 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -41,6 +41,8 @@ tasks.register("includeViewBindingInDex") { group = "build" description = "Ensures ViewBinding-generated classes are included in dex." + dependsOn("compileDebugKotlin") + val viewBindingDir = layout.buildDirectory.dir("generated/source/viewBinding/debug") val kotlinOutput = layout.buildDirectory.dir("tmp/kotlin-classes/debug") val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") From bae31d6b3310b5046e7488c2c69e1589fba80c6a Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:39:29 -0600 Subject: [PATCH 19/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index 0c685f5965..2f87f0f1e3 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -58,8 +58,6 @@ tasks.register("includeViewBindingInDex") { tasks.named("compileDex") { dependsOn("includeViewBindingInDex") - doFirst { - val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile - inputs.dir(dexInputDir) - } + val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile + inputs.dir(dexInputDir) } From 5f1e249c8d61344dbbaa0c832434a5d170c81480 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:56:09 -0600 Subject: [PATCH 20/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index 2f87f0f1e3..b0a46fad11 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -43,8 +43,7 @@ tasks.register("includeViewBindingInDex") { dependsOn("compileDebugKotlin") - val viewBindingDir = layout.buildDirectory.dir("generated/source/viewBinding/debug") - val kotlinOutput = layout.buildDirectory.dir("tmp/kotlin-classes/debug") + val viewBindingDir = layout.buildDirectory.dir("generated/data_binding_base_class_source_out/debug/out") val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") from(viewBindingDir) From d526283c54b1e6c5140063eedd967a317f0ddb75 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:56:36 -0600 Subject: [PATCH 21/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index b0a46fad11..b33e325e3b 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -47,7 +47,6 @@ tasks.register("includeViewBindingInDex") { val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") from(viewBindingDir) - from(kotlinOutput) into(dexInputDir) doLast { From 3fb8e1085abb6a75ad4cbe7baa62149aa5c5bcff Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:14:36 -0600 Subject: [PATCH 22/23] Update build.gradle.kts --- ExampleProvider/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index b33e325e3b..40330bf419 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -44,18 +44,18 @@ tasks.register("includeViewBindingInDex") { dependsOn("compileDebugKotlin") val viewBindingDir = layout.buildDirectory.dir("generated/data_binding_base_class_source_out/debug/out") - val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput") + val dexInputDir = layout.buildDirectory.dir("intermediates/classes.dex") from(viewBindingDir) into(dexInputDir) doLast { - println("Included ViewBinding classes from: ${viewBindingDir.get().asFile}") + println("Included ViewBinding classes from: ${viewBindingDir.get().asFile}, to: ${dexInputDir.get().asFile}") } } tasks.named("compileDex") { dependsOn("includeViewBindingInDex") - val dexInputDir = layout.buildDirectory.dir("intermediates/dexInput").get().asFile + val dexInputDir = layout.buildDirectory.dir("intermediates/classes.dex").get().asFile inputs.dir(dexInputDir) } From b1df3108d7e3eac726efe37b31698bf495a7f3aa Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:25:52 -0600 Subject: [PATCH 23/23] Try --- ExampleProvider/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ExampleProvider/build.gradle.kts b/ExampleProvider/build.gradle.kts index 40330bf419..751801f4ca 100644 --- a/ExampleProvider/build.gradle.kts +++ b/ExampleProvider/build.gradle.kts @@ -44,7 +44,7 @@ tasks.register("includeViewBindingInDex") { dependsOn("compileDebugKotlin") val viewBindingDir = layout.buildDirectory.dir("generated/data_binding_base_class_source_out/debug/out") - val dexInputDir = layout.buildDirectory.dir("intermediates/classes.dex") + val dexInputDir = layout.buildDirectory.dir("../src/main/java") from(viewBindingDir) into(dexInputDir) @@ -56,6 +56,6 @@ tasks.register("includeViewBindingInDex") { tasks.named("compileDex") { dependsOn("includeViewBindingInDex") - val dexInputDir = layout.buildDirectory.dir("intermediates/classes.dex").get().asFile - inputs.dir(dexInputDir) + // val dexInputDir = layout.buildDirectory.dir("intermediates/classes.dex").get().asFile + // inputs.dir(dexInputDir) }