From 67cc21beef55388da5109a1c02fbdf75a0884455 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Fri, 20 Aug 2021 23:31:42 -0400 Subject: [PATCH] Move BuildConfigs to thier own package so KtLint ignores it --- build.gradle.kts | 6 ++++-- buildSrc/src/main/kotlin/Config.kt | 4 ++-- src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt | 2 +- src/main/kotlin/ca/gosyer/data/download/DownloadService.kt | 2 +- src/main/kotlin/ca/gosyer/data/server/HttpClient.kt | 2 +- src/main/kotlin/ca/gosyer/data/server/ServerService.kt | 2 +- .../kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt | 2 +- src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt | 2 +- src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt | 2 +- src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt | 2 +- src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt | 2 +- src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt | 2 +- src/main/kotlin/ca/gosyer/ui/main/main.kt | 2 +- src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt | 2 +- src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt | 2 +- .../kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt | 2 +- src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt | 2 +- .../ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt | 2 +- src/main/kotlin/ca/gosyer/util/system/File.kt | 2 +- 19 files changed, 23 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0f0ab068..96224bd5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -128,16 +128,18 @@ tasks { withType { source(files("src")) + exclude("ca/gosyer/build") } withType { 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()) diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 1e6d325e..f4790922 100644 --- 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 } \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt b/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt index 9e5c2761..c5fcf560 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/data/download/DownloadService.kt b/src/main/kotlin/ca/gosyer/data/download/DownloadService.kt index b8146a54..8b92980a 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/data/server/HttpClient.kt b/src/main/kotlin/ca/gosyer/data/server/HttpClient.kt index 6f9748a2..d3d3e482 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt index 50b936eb..e17c1ca1 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt index 50caacba..45a8ff42 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt index 834230ee..b412c57c 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt b/src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt index 00bbcfb5..ddf78fe9 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt index 7a2359b8..76a6146e 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt index 096ba1af..aa7c6b2d 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt b/src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt index c72b0347..0254ca7a 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/main/main.kt b/src/main/kotlin/ca/gosyer/ui/main/main.kt index ebd8d3a9..e0c90a5e 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt index 56e74b6b..242a0828 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt b/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt index e391447e..1404def9 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt b/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt index f7da3b35..4c504059 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt index d2b5f51f..92cbd000 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt b/src/main/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt index be892030..b49487fb 100644 --- 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 diff --git a/src/main/kotlin/ca/gosyer/util/system/File.kt b/src/main/kotlin/ca/gosyer/util/system/File.kt index 59310bd0..c81eaf78 100644 --- 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