Compare commits

..

12 commits

Author SHA1 Message Date
Cloudburst
1e0b457503
final try 2022-08-19 16:43:06 +02:00
C10udburst
a9f1ef0fbb ig one provider will always be without filesize because gradle is dogshit 2022-08-19 16:10:03 +02:00
C10udburst
26c1af5710 fix once again 2022-08-19 15:31:05 +02:00
C10udburst
e46204f939 ok ig lets try this 2022-08-19 15:28:29 +02:00
C10udburst
18915372d0 guh fix 2022-08-19 15:23:16 +02:00
C10udburst
de10dccb38 fix that race condition 2022-08-19 15:07:54 +02:00
C10udburst
3810f1a580 i just needed to write this properly and not be lazy 2022-08-19 14:16:55 +02:00
Cloudburst
269e597e4e
fix wrong order? 2022-08-19 14:06:24 +02:00
Cloudburst
b8745441c7
add json logging and ci error handling 2022-08-19 13:42:29 +02:00
Cloudburst
8d84a80740
fix deployWithAdb only working for the debug app 2022-08-19 11:25:01 +02:00
C10udburst
77686b33fd fix filesize? 2022-08-19 10:31:42 +02:00
C10udburst
ba11261aac add file size if extension built before json task 2022-08-19 10:12:39 +02:00
7 changed files with 21 additions and 7 deletions

View file

@ -14,3 +14,8 @@ jobs:
run: |
wget "https://jitpack.io/com/github/recloudstream/gradle/${GITHUB_REF##*/}-${SHORT_SHA}-1/build.log" -T 300
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,6 +37,7 @@ abstract class CloudstreamExtension @Inject constructor(project: Project) {
}
internal var pluginClassName: String? = null
internal var fileSize: Long? = null
var requiresResources = false
var description: String? = null

View file

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

View file

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

View file

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

View file

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

View file

@ -11,7 +11,8 @@ import org.gradle.api.Project
import org.gradle.api.tasks.AbstractCopyTask
import org.gradle.api.tasks.bundling.Zip
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"
@ -22,7 +23,7 @@ fun registerTasks(project: Project) {
if (project.rootProject.tasks.findByName("makePluginsJson") == null) {
project.rootProject.tasks.register("makePluginsJson", MakePluginsJsonTask::class.java) {
it.group = TASK_GROUP
it.outputs.upToDateWhen { false }
it.outputFile.set(it.project.buildDir.resolve("plugins.json"))
@ -81,7 +82,7 @@ fun registerTasks(project: Project) {
}
project.afterEvaluate {
project.tasks.register("make", Zip::class.java) {
val make = project.tasks.register("make", Zip::class.java) {
val compileDexTask = compileDex.get()
it.dependsOn(compileDexTask)
@ -116,9 +117,11 @@ fun registerTasks(project: Project) {
zip.destinationDirectory.set(project.buildDir)
it.doLast { task ->
extension.fileSize = task.outputs.files.singleFile.length()
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) {
@ -129,4 +132,4 @@ fun registerTasks(project: Project) {
it.group = TASK_GROUP
it.dependsOn("make")
}
}
}