milan jurkulák 2 лет назад
Родитель
Сommit
b0c357913c

+ 1 - 1
app/src/main/assets/adblock.txt

@@ -128,4 +128,4 @@ https://prehraj.to/front/js/alt-ads.js
 https://prehraj.to/front/img/favicon/favicon.png
 https://prehraj.to/front/img/favicon/favicon.gif
 https://prehraj.to/front/img/favicon/favicon.jpg
-https://securepubads.g.doubleclick.net/
+https://securepubads.g.doubleclick.net/

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

@@ -13,7 +13,6 @@ import io.gitlab.arturbosch.detekt.DetektPlugin
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.mjdev.gradle.extensions.addSyncProviderAuthString

+ 1 - 1
buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/LibPlugin.kt

@@ -47,7 +47,7 @@ class LibPlugin : BasePlugin() {
     private val configFieldName = "libConfig"
 
     override fun Project.work() {
-//        loadVersionCatalog(projectLibVersionsFile)
+        loadVersionCatalog(projectLibVersionsFile)
         extension<LibConfig>(configFieldName)
         apply(plugin ="version-catalog")
         apply(plugin = "kotlin-android")

+ 0 - 28
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/DetektCleanTask.kt

@@ -1,28 +0,0 @@
-/*
- *  Copyright (c) Milan Jurkulák 2024.
- *  Contact:
- *  e: mimoccc@gmail.com
- *  e: mj@mjdev.org
- *  w: https://mjdev.org
- */
-
-package org.mjdev.gradle.tasks
-
-import org.gradle.api.tasks.TaskAction
-import org.mjdev.gradle.base.BaseTask
-
-// todo
-open class DetektCleanTask : BaseTask() {
-
-    init {
-        group = "mjdev"
-        description = "Kotlin lint clean task."
-        outputs.upToDateWhen { false }
-    }
-
-    @TaskAction
-    fun taskAction() {
-        // todo
-    }
-
-}

+ 0 - 45
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/DetektCreateTask.kt

@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) Milan Jurkulák 2024.
- *  Contact:
- *  e: mimoccc@gmail.com
- *  e: mj@mjdev.org
- *  w: https://mjdev.org
- */
-
-package org.mjdev.gradle.tasks
-
-import org.gradle.api.tasks.TaskAction
-import org.mjdev.gradle.base.BaseTask
-
-
-open class DetektCreateTask : BaseTask() {
-
-    private val documentationDir = "documentation"
-
-    init {
-        group = "mjdev"
-        description = "Kotlin code check and format task."
-
-//        tasks.byType<DetektGenerateConfigTask>().apply {
-//            runAfter(this)
-//        }
-//        tasks.byName<Task>("ktlintFormat").apply {
-//            runAfter(cleanTask)
-//        }
-
-        outputs.upToDateWhen { false }
-    }
-
-    @TaskAction
-    fun taskAction() {
-//        applyPlugin("org.jlleitschuh.gradle.ktlint")
-//        configureExtension<DetektExtension> {
-//            autoCorrect = true
-//            parallel = false
-//
-//            source = project.files("src/main/kotlin")
-//            reportsDir = project.rootProject.file(documentationDir)
-//        }
-    }
-
-}

+ 0 - 35
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/DokkaCleanTask.kt

@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) Milan Jurkulák 2024.
- *  Contact:
- *  e: mimoccc@gmail.com
- *  e: mj@mjdev.org
- *  w: https://mjdev.org
- */
-
-package org.mjdev.gradle.tasks
-
-import org.gradle.api.tasks.TaskAction
-import java.io.File
-import org.mjdev.gradle.extensions.file
-import org.mjdev.gradle.extensions.projectName
-import org.mjdev.gradle.base.BaseTask
-
-open class DokkaCleanTask : BaseTask() {
-
-    private val docProjectDir: File
-        get() =  project.rootProject
-            .file("documentation")
-            .file(projectName)
-
-    init {
-        group = "mjdev"
-        description = "Documentation clean task."
-        outputs.upToDateWhen { false }
-    }
-
-    @TaskAction
-    fun taskAction() {
-        project.rootProject.file(docProjectDir).deleteRecursively()
-    }
-
-}

+ 0 - 44
buildSrc/src/main/kotlin/org/mjdev/gradle/tasks/DokkaCreateTask.kt

@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) Milan Jurkulák 2024.
- *  Contact:
- *  e: mimoccc@gmail.com
- *  e: mj@mjdev.org
- *  w: https://mjdev.org
- */
-package org.mjdev.gradle.tasks
-//
-//import org.jetbrains.dokka.gradle.DokkaTask
-import org.mjdev.gradle.extensions.file
-import org.mjdev.gradle.extensions.projectName
-import java.io.File
-//
-//open class DokkaCreateTask : DokkaTask() {
-//
-//    private val documentationDir: File
-//        get() = project.rootProject.file("documentation")
-//
-//    private val docProjectDir: File
-//        get() = documentationDir
-//            .file(projectName)
-//            .file("documentation")
-//
-//    init {
-//        group = "mjdev"
-//        description = "Documentation create task."
-//
-//        outputDirectory = docProjectDir.absolutePath
-//        sourceDirs = listOf(File(project.projectDir.absolutePath))
-//        outputFormat = "gfm"
-//        includeNonPublic = true
-//        reportUndocumented = true
-//        sourceRoot {
-//            path = File(project.rootDir, "src/main/kotlin").absolutePath
-//        }
-//        skipEmptyPackages = false
-//        collectInheritedExtensionsFromLibraries = false
-//        outputFormat = "gfm"
-//
-//        outputs.upToDateWhen { false }
-//    }
-//
-//}