Move BuildConfigs to thier own package so KtLint ignores it

2025-12-10 06:42:05 +01:00 · 2021-08-20 23:31:42 -04:00
parent 52afbb8619
commit 67cc21beef
19 changed files with 23 additions and 21 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -128,16 +128,18 @@ tasks {

    withType<LintTask> {
        source(files("src"))
+        exclude("ca/gosyer/build")
    }

    withType<FormatTask> {
        source(files("src"))
+        exclude("ca/gosyer/build")
    }

    registerTachideskTasks(project)

    task("generateResourceConstants") {
-        val buildResources = buildConfig.forClass(project.group.toString(), "BuildResources")
+        val buildResources = buildConfig.forClass(project.group.toString()+ ".build", "BuildResources")

        doFirst {
            val langs = listOf("en") + sourceSets["main"].resources
@@ -202,7 +204,7 @@ compose.desktop {
 fun String.wrap() = """"$this""""
 buildConfig {
    className("BuildConfig")
-    packageName(project.group.toString())
+    packageName(project.group.toString() + ".build")
    useKotlinOutput { internalVisibility = true }

    buildConfigField("String", "NAME", project.name.wrap())
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -3,9 +3,9 @@ import org.gradle.api.JavaVersion
 object Config {
    const val tachideskVersion = "v0.4.7"
    // Bump this when updating the Tachidesk version or Preview commit
-    const val serverCode = 3
+    const val serverCode = 809
    const val preview = true
-    const val previewCommit = "da44d3b2b48357d10e4c28e3b01fed4d2465115c"
+    const val previewCommit = "b31f2d50f6ed03aa900986536d90b4aa9a9417d4"

    val jvmTarget = JavaVersion.VERSION_15
 }
--- a/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt
+++ b/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt
@@ -6,7 +6,7 @@

 package ca.gosyer.core.logging

-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import com.github.weisj.darklaf.LafManager
 import mu.KotlinLogging
 import org.apache.logging.log4j.Level
--- a/src/main/kotlin/ca/gosyer/data/download/DownloadService.kt
+++ b/src/main/kotlin/ca/gosyer/data/download/DownloadService.kt
@@ -6,7 +6,7 @@

 package ca.gosyer.data.download

-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.download.model.DownloadChapter
 import ca.gosyer.data.download.model.DownloadStatus
 import ca.gosyer.data.download.model.DownloaderStatus
--- a/src/main/kotlin/ca/gosyer/data/server/HttpClient.kt
+++ b/src/main/kotlin/ca/gosyer/data/server/HttpClient.kt
@@ -6,7 +6,7 @@

 package ca.gosyer.data.server

-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.server.model.Auth
 import ca.gosyer.data.server.model.Proxy
 import io.ktor.client.HttpClient
--- a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt
+++ b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt
@@ -6,7 +6,7 @@

 package ca.gosyer.data.server

-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.util.lang.withIOContext
 import ca.gosyer.util.system.CKLogger
 import ca.gosyer.util.system.userDataDir
--- a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt
+++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt
@@ -11,7 +11,7 @@ import androidx.compose.material.TextField
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.text.input.TextFieldValue
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.ui.base.WindowDialog
 import ca.gosyer.ui.base.resources.stringResource
 import kotlinx.coroutines.flow.MutableStateFlow
--- a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt
@@ -41,7 +41,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.ui.base.resources.stringResource
 import ca.gosyer.ui.base.vm.viewModel
 import ca.gosyer.util.compose.ThemedWindow
--- a/src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt
@@ -40,7 +40,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.download.model.DownloadChapter
 import ca.gosyer.data.download.model.DownloaderStatus
 import ca.gosyer.data.models.Chapter
--- a/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt
@@ -46,7 +46,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.WindowSize
 import androidx.compose.ui.window.rememberWindowState
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.models.Extension
 import ca.gosyer.ui.base.WindowDialog
 import ca.gosyer.ui.base.components.ActionIcon
--- a/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEachIndexed
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.library.model.DisplayMode
 import ca.gosyer.data.models.Category
 import ca.gosyer.data.models.Manga
--- a/src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt
@@ -47,7 +47,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.download.DownloadService
 import ca.gosyer.data.ui.model.StartScreen
 import ca.gosyer.ui.base.components.combinedMouseClickable
--- a/src/main/kotlin/ca/gosyer/ui/main/main.kt
+++ b/src/main/kotlin/ca/gosyer/ui/main/main.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.awaitApplication
 import androidx.compose.ui.window.rememberWindowState
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.core.logging.initializeLogger
 import ca.gosyer.data.DataModule
 import ca.gosyer.data.server.ServerService
--- a/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt
@@ -44,7 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.models.Category
 import ca.gosyer.data.models.Manga
 import ca.gosyer.ui.base.WindowDialog
--- a/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
@@ -36,7 +36,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.WindowPlacement
 import androidx.compose.ui.window.rememberWindowState
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.common.di.AppScope
 import ca.gosyer.data.reader.model.Direction
 import ca.gosyer.data.reader.model.ImageScale
--- a/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Divider
 import androidx.compose.runtime.Composable
-import ca.gosyer.BuildResources
+import ca.gosyer.build.BuildResources
 import ca.gosyer.data.ui.UiPreferences
 import ca.gosyer.data.ui.model.StartScreen
 import ca.gosyer.ui.base.components.Toolbar
--- a/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.unit.dp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.data.models.Source
 import ca.gosyer.ui.base.components.ActionIcon
 import ca.gosyer.ui.base.components.KtorImage
--- a/src/main/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.ui.base.WindowDialog
 import ca.gosyer.ui.base.components.Toolbar
 import ca.gosyer.ui.base.prefs.ChoiceDialog
--- a/src/main/kotlin/ca/gosyer/util/system/File.kt
+++ b/src/main/kotlin/ca/gosyer/util/system/File.kt
@@ -6,7 +6,7 @@

 package ca.gosyer.util.system

-import ca.gosyer.BuildConfig
+import ca.gosyer.build.BuildConfig
 import ca.gosyer.util.lang.launchUI
 import kotlinx.coroutines.DelicateCoroutinesApi
 import mu.KotlinLogging