Procházet zdrojové kódy

generated files removal

milan jurkulák před 2 roky
rodič
revize
b8d3b1a96f

+ 1 - 1
.github/workflows/build-gradle-project.yml

@@ -64,7 +64,7 @@ jobs:
           allowUpdates: true
           token: ${{ secrets.TOKEN }}
           tag: release-${{ env.GITHUB_APP_VERSION_NAME }}
-          artifacts: './app/build/outputs/apk/release/app-release.apk, ./documentation/release-notes-$APP_VERSION.txt, ./release.zip'
+          artifacts: './app/build/outputs/apk/release/app-release.apk, ./documentation/release-notes-$APP_VERSION.md, ./release.zip'
 # update wiki pages
       - name: Update wiki pages
         id: update_wiki_pages

+ 0 - 4
app/build.gradle.kts

@@ -14,10 +14,6 @@ appConfig {
     namespace = "org.mjdev.tvapp"
     description = "Smart TV android app for any android device"
 
-    createDocumentation = true
-    createWebApp = true
-    createWebSiteFromGit = false
-
     // todo
     default {
 //        buildConfigString(

+ 3 - 2
buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/ProjectExt.kt

@@ -276,8 +276,9 @@ inline fun <reified T : Task> Project.registerTask(
     name: String? = null,
     fn: T.() -> Unit = {}
 ): T {
-    val taskName = name
-        ?: T::class.java.simpleName.replace("Task", "").unCapitalize()
+    val taskName = name ?: T::class.java.simpleName
+            .replace("Task", "")
+            .unCapitalize()
     tasks.register(taskName, T::class.java)
     return tasks.findByName(taskName).let { task ->
         task as T

+ 9 - 0
buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/AppPlugin.kt

@@ -272,6 +272,15 @@ class AppPlugin : BasePlugin() {
                 if (appConfig.createReleaseNotes) {
                     mustRunAfter(releaseNotesCreateTask())
                 }
+                if (appConfig.createWebApp) {
+                    mustRunAfter(webServiceCreateTask())
+                }
+                if (appConfig.createDocumentation) {
+                    mustRunAfter(dokkaTask())
+                }
+                if (appConfig.autoCorrectCode) {
+                    mustRunAfter(detektTask())
+                }
             }
             kotlinCompileOptions {
                 kotlinOptions {

+ 18 - 8
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/CheckNewLibsTask.kt

@@ -34,13 +34,13 @@ open class CheckNewLibsTask : BaseTask() {
 
     @Optional
     @Input
-    var reportFilePath = "dependencies.txt"
+    var reportFilePath = "dependencies.md"
 
     private val tomlFile
-        get() = project.buildDirectory.resolve(tomlFilePath)
+        get() = project.rootDir.resolve(tomlFilePath)
 
     private val reportFile
-        get() = project.buildDirectory.resolve(reportFilePath)
+        get() = project.rootDir.resolve(reportFilePath)
 
     private val isTomlFileExists
         get() = tomlFile.exists()
@@ -67,7 +67,7 @@ open class CheckNewLibsTask : BaseTask() {
 
     init {
         group = "mjdev"
-        description = "This task configure properties in project."
+        description = "This task check new libraries versions in project."
         outputs.upToDateWhen { false }
     }
 
@@ -96,10 +96,20 @@ open class CheckNewLibsTask : BaseTask() {
 
     private fun printInfo() {
         StringBuilder().apply {
-            appendLine("New libs detected for project :${project.name} ")
-            newLibs.forEach { line ->  appendLine(line) }
-            println("Missing version.ref - Need to check manually")
-            missingLibs.forEach { line ->  appendLine(line) }
+            appendLine("## Project libraries check")
+            if (newLibs.size == 0 && missingLibs.size == 0) {
+                appendLine("* No new libs detected for project.")
+                appendLine("* All libs up to date.")
+            } else {
+                if (newLibs.size > 0) {
+                    appendLine("* New libs detected for project:")
+                    newLibs.forEach { line -> appendLine(" - $line") }
+                }
+                if (missingLibs.size > 0) {
+                    println("* Missing version.ref - Need to check manually")
+                    missingLibs.forEach { line -> appendLine(" - $line") }
+                }
+            }
         }.toString().writeToFile(reportFile)
     }
 

+ 1 - 1
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/ReleaseNotesCreateTask.kt

@@ -56,7 +56,7 @@ open class ReleaseNotesCreateTask : BaseTask() {
         println("Creating release notes")
         StringBuilder().apply {
             @Suppress("DEPRECATION")
-            append("** Release notes $projectVersion - ${Date().toLocaleString()}\n")
+            append("## Release notes $projectVersion - ${Date().toLocaleString()}\n")
             branches.forEach { ref ->
                 if (ref.name.endsWith(branchName)) {
                     val commits = git.log().all().call().sortedByDescending {

+ 4 - 2
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/ZipReleaseCreateTask.kt

@@ -18,10 +18,12 @@ open class ZipReleaseCreateTask : BaseTask() {
 
     @Suppress("DEPRECATION")
     private val files = mutableListOf(
-        project.rootDir
-            .resolve("documentation"),
         project.rootDir
             .resolve("readme.md"),
+        project.rootDir
+            .resolve("dependencies.md"),
+        project.rootDir
+            .resolve("documentation"),
         project.rootDir
             .resolve("reports"),
         project.rootDir

+ 0 - 0
reports/.nomedia


+ 1 - 5
tvlib/build.gradle.kts

@@ -13,8 +13,4 @@ plugins {
 libConfig {
     namespace = "org.mjdev.tvlib"
     description = "Smart TV android app lib for android applications running on any android device"
-
-    autoCorrectCode = true
-    createDocumentation = true
-    minify = false
-}
+}