Compare commits

..

No commits in common. "1e0b457503898e85327678e308b08b5e7ec596bb" and "964c425973c2230206c68a9e5b94f1c8b2fe3948" have entirely different histories.

7 changed files with 7 additions and 21 deletions

View file

@ -14,8 +14,3 @@ jobs:
run: | run: |
wget "https://jitpack.io/com/github/recloudstream/gradle/${GITHUB_REF##*/}-${SHORT_SHA}-1/build.log" -T 300 wget "https://jitpack.io/com/github/recloudstream/gradle/${GITHUB_REF##*/}-${SHORT_SHA}-1/build.log" -T 300
cat build.log cat build.log
- name: Check status
run: |
if grep -q "FAILURE: Build failed with an exception." build.log; then
echo "::error::Jitpack build failed with an exception." && exit 1
fi

View file

@ -37,7 +37,6 @@ abstract class CloudstreamExtension @Inject constructor(project: Project) {
} }
internal var pluginClassName: String? = null internal var pluginClassName: String? = null
internal var fileSize: Long? = null
var requiresResources = false var requiresResources = false
var description: String? = null var description: String? = null

View file

@ -47,7 +47,6 @@ fun Project.makePluginEntry(): PluginEntry {
language = extension.language, language = extension.language,
iconUrl = extension.iconUrl, iconUrl = extension.iconUrl,
apiVersion = extension.apiVersion, apiVersion = extension.apiVersion,
tvTypes = extension.tvTypes, tvTypes = extension.tvTypes
fileSize = extension.fileSize
) )
} }

View file

@ -8,7 +8,6 @@ data class PluginEntry(
val internalName: String, val internalName: String,
val authors: List<String>, val authors: List<String>,
val description: String?, val description: String?,
val fileSize: Long?,
val repositoryUrl: String?, val repositoryUrl: String?,
val language: String?, val language: String?,
val tvTypes: List<String>?, val tvTypes: List<String>?,

View file

@ -43,7 +43,7 @@ abstract class DeployWithAdbTask : DefaultTask() {
device.push(file, RemoteFile(path + file.name)) device.push(file, RemoteFile(path + file.name))
val args = arrayListOf("start", "-a", "android.intent.action.VIEW", "-d", "cloudstreamapp:") val args = arrayListOf("start", "-S", "-n", "com.lagradost.cloudstream3.debug/com.lagradost.cloudstream3.MainActivity")
if (waitForDebugger) { if (waitForDebugger) {
args.add("-D") args.add("-D")

View file

@ -10,7 +10,6 @@ import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
import java.util.LinkedList import java.util.LinkedList
import java.lang.Thread
abstract class MakePluginsJsonTask : DefaultTask() { abstract class MakePluginsJsonTask : DefaultTask() {
@get:OutputFile @get:OutputFile
@ -21,7 +20,7 @@ abstract class MakePluginsJsonTask : DefaultTask() {
val lst = LinkedList<PluginEntry>() val lst = LinkedList<PluginEntry>()
for (subproject in project.allprojects) { for (subproject in project.allprojects) {
subproject.extensions.findCloudstream() ?: continue val cloudstream = subproject.extensions.findCloudstream() ?: continue
lst.add(subproject.makePluginEntry()) lst.add(subproject.makePluginEntry())
} }
@ -34,7 +33,5 @@ abstract class MakePluginsJsonTask : DefaultTask() {
.build() .build()
).toPrettyString() ).toPrettyString()
) )
logger.lifecycle("Created ${outputFile.asFile.get()}")
} }
} }

View file

@ -12,7 +12,6 @@ import org.gradle.api.tasks.AbstractCopyTask
import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.bundling.Zip
import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import com.lagradost.cloudstream3.gradle.findCloudstream
const val TASK_GROUP = "cloudstream" const val TASK_GROUP = "cloudstream"
@ -82,7 +81,7 @@ fun registerTasks(project: Project) {
} }
project.afterEvaluate { project.afterEvaluate {
val make = project.tasks.register("make", Zip::class.java) { project.tasks.register("make", Zip::class.java) {
val compileDexTask = compileDex.get() val compileDexTask = compileDex.get()
it.dependsOn(compileDexTask) it.dependsOn(compileDexTask)
@ -117,11 +116,9 @@ fun registerTasks(project: Project) {
zip.destinationDirectory.set(project.buildDir) zip.destinationDirectory.set(project.buildDir)
it.doLast { task -> it.doLast { task ->
extension.fileSize = task.outputs.files.singleFile.length()
task.logger.lifecycle("Made Cloudstream package at ${task.outputs.files.singleFile}") task.logger.lifecycle("Made Cloudstream package at ${task.outputs.files.singleFile}")
} }
} }
project.rootProject.tasks.getByName("makePluginsJson").dependsOn(make)
} }
project.tasks.register("cleanCache", CleanCacheTask::class.java) { project.tasks.register("cleanCache", CleanCacheTask::class.java) {