Parcourir la source

temporary dokka disablement & code cleanup

Milan Jurkulak il y a 3 ans
Parent
commit
a501e88fd9

+ 7 - 7
app/build.gradle.kts

@@ -29,7 +29,7 @@ plugins {
     id("kotlin-parcelize")
     id("com.google.dagger.hilt.android")
     id("dagger.hilt.android.plugin")
-    id("org.jetbrains.dokka") version "1.8.10"
+//    id("org.jetbrains.dokka") version "1.8.10"
     id("io.objectbox")
     id("MainAppPlugin")
 }
@@ -156,13 +156,13 @@ android {
         checkReleaseBuilds = false
     }
 
-    subprojects {
-        apply(plugin = "org.jetbrains.dokka")
-    }
+//    subprojects {
+//        apply(plugin = "org.jetbrains.dokka")
+//    }
 
-    tasks.dokkaGfm {
-        outputDirectory.set(File(projectDir, "../wiki/documentation"))
-    }
+//    tasks.dokkaGfm {
+//        outputDirectory.set(File(projectDir, "../wiki/documentation"))
+//    }
 
 }
 

+ 11 - 11
buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/MainAppPlugin.kt

@@ -33,7 +33,7 @@ abstract class MainAppPlugin : Plugin<Project> {
         const val SIGNING_CONFIG_NAME = "Any"
 
         const val TASK_PREPARE_RELEASE_NOTES = "prepareReleaseNotes"
-        const val TASK_DOKKA = "dokkaGfm"
+//        const val TASK_DOKKA = "dokkaGfm"
 
         const val TASK_ASSEMBLE_RELEASE = "assembleRelease"
         const val TASK_ASSEMBLE_DEBUG = "assembleDebug"
@@ -244,17 +244,17 @@ abstract class MainAppPlugin : Plugin<Project> {
         }
 
         // tasks after build
-        project.afterEvaluate {
-            listOf(
+//        project.afterEvaluate {
+//            listOf(
 //                TASK_ASSEMBLE_DEBUG,
-                TASK_ASSEMBLE_MOCK,
-                TASK_ASSEMBLE_RELEASE,
-                TASK_ASSEMBLE_MINIFIED
-            ).forEach { taskName ->
-                tasks.findByName(taskName)
-                    ?.finalizedBy(TASK_PREPARE_RELEASE_NOTES, TASK_DOKKA)
-            }
-        }
+//                TASK_ASSEMBLE_MOCK,
+//                TASK_ASSEMBLE_RELEASE,
+//                TASK_ASSEMBLE_MINIFIED
+//            ).forEach { taskName ->
+//                tasks.findByName(taskName)
+//                    ?.finalizedBy(TASK_PREPARE_RELEASE_NOTES, TASK_DOKKA)
+//            }
+//        }
 
 //        // dependencies
 //        project.dependencies.apply {

+ 5 - 1
tvlib/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
     kotlin("kapt")
     id("com.google.dagger.hilt.android")
     id("dagger.hilt.android.plugin")
-    id("org.jetbrains.dokka") version "1.8.10"
+//    id("org.jetbrains.dokka") version "1.8.10"
 }
 
 android {
@@ -64,6 +64,10 @@ android {
         checkReleaseBuilds = false
     }
 
+//    tasks.dokkaGfm {
+//        outputDirectory.set(File(projectDir, "../wiki/documentation"))
+//    }
+
 }
 
 dependencies {

+ 1 - 0
tvlib/src/main/kotlin/org/mjdev/tvlib/extensions/HiltExt.kt

@@ -108,6 +108,7 @@ object HiltExt {
         }
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun createInternal(
         activity: Activity,
         owner: SavedStateRegistryOwner,

+ 1 - 1
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/tv/Loading.kt

@@ -47,7 +47,7 @@ fun Loading(
             text = text,
             color = textColor,
             fontSize = textSize,
-            style = MaterialTheme.typography.headlineMedium
+            style = textStyle
         )
     }
 }

+ 1 - 0
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/tv/LocalAudioRow.kt

@@ -63,4 +63,5 @@ fun LocalAudioRow(
     sortOrder = sortOrder,
     transform = transform,
     openItem = openItem,
+    cursor = cursor
 )

+ 1 - 0
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/tv/LocalPhotosRow.kt

@@ -63,4 +63,5 @@ fun LocalPhotosRow(
     sortOrder = sortOrder,
     transform = transform,
     openItem = openItem,
+    cursor = cursor
 )

+ 1 - 0
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/tv/LocalVideoRow.kt

@@ -64,5 +64,6 @@ fun LocalVideoRow(
         sortOrder = sortOrder,
         transform = { c -> VideoItem(contentResolver, c) },
         openItem = openItem,
+        cursor = cursor
     )
 }