mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 14:52:03 +01:00
Code Issues Projects Releases Wiki Activity

Move BuildConfigs to thier own package so KtLint ignores it

Browse Source
This commit is contained in:
Syer10
2021-08-20 23:31:42 -04:00
parent 52afbb8619
commit 67cc21beef
19 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle.kts
View File

@@ -128,16 +128,18 @@ tasks {
withType<LintTask> { withType<LintTask> {
source(files("src")) source(files("src"))
exclude("ca/gosyer/build")
} }
withType<FormatTask> { withType<FormatTask> {
source(files("src")) source(files("src"))
exclude("ca/gosyer/build")
} }
registerTachideskTasks(project) registerTachideskTasks(project)
task("generateResourceConstants") { task("generateResourceConstants") {
val buildResources = buildConfig.forClass(project.group.toString(), "BuildResources") val buildResources = buildConfig.forClass(project.group.toString()+ ".build", "BuildResources")
doFirst { doFirst {
val langs = listOf("en") + sourceSets["main"].resources val langs = listOf("en") + sourceSets["main"].resources
@@ -202,7 +204,7 @@ compose.desktop {
fun String.wrap() = """"$this"""" fun String.wrap() = """"$this""""
buildConfig { buildConfig {
className("BuildConfig") className("BuildConfig")
packageName(project.group.toString()) packageName(project.group.toString() + ".build")
useKotlinOutput { internalVisibility = true } useKotlinOutput { internalVisibility = true }
buildConfigField("String", "NAME", project.name.wrap()) buildConfigField("String", "NAME", project.name.wrap())

4
buildSrc/src/main/kotlin/Config.kt
View File

@@ -3,9 +3,9 @@ import org.gradle.api.JavaVersion
object Config { object Config {
const val tachideskVersion = "v0.4.7" const val tachideskVersion = "v0.4.7"
// Bump this when updating the Tachidesk version or Preview commit // Bump this when updating the Tachidesk version or Preview commit
const val serverCode = 3 const val serverCode = 809
const val preview = true const val preview = true
const val previewCommit = "da44d3b2b48357d10e4c28e3b01fed4d2465115c" const val previewCommit = "b31f2d50f6ed03aa900986536d90b4aa9a9417d4"
val jvmTarget = JavaVersion.VERSION_15 val jvmTarget = JavaVersion.VERSION_15
} }

2
src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt
View File

@@ -6,7 +6,7 @@
package ca.gosyer.core.logging package ca.gosyer.core.logging
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import com.github.weisj.darklaf.LafManager import com.github.weisj.darklaf.LafManager
import mu.KotlinLogging import mu.KotlinLogging
import org.apache.logging.log4j.Level import org.apache.logging.log4j.Level

2
src/main/kotlin/ca/gosyer/data/download/DownloadService.kt
View File

@@ -6,7 +6,7 @@
package ca.gosyer.data.download 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.DownloadChapter
import ca.gosyer.data.download.model.DownloadStatus import ca.gosyer.data.download.model.DownloadStatus
import ca.gosyer.data.download.model.DownloaderStatus import ca.gosyer.data.download.model.DownloaderStatus

2
src/main/kotlin/ca/gosyer/data/server/HttpClient.kt
View File

@@ -6,7 +6,7 @@
package ca.gosyer.data.server 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.Auth
import ca.gosyer.data.server.model.Proxy import ca.gosyer.data.server.model.Proxy
import io.ktor.client.HttpClient import io.ktor.client.HttpClient

2
src/main/kotlin/ca/gosyer/data/server/ServerService.kt
View File

@@ -6,7 +6,7 @@
package ca.gosyer.data.server package ca.gosyer.data.server
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.util.lang.withIOContext import ca.gosyer.util.lang.withIOContext
import ca.gosyer.util.system.CKLogger import ca.gosyer.util.system.CKLogger
import ca.gosyer.util.system.userDataDir import ca.gosyer.util.system.userDataDir

2
src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.material.TextField
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.text.input.TextFieldValue 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.WindowDialog
import ca.gosyer.ui.base.resources.stringResource import ca.gosyer.ui.base.resources.stringResource
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

2
src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt
View File

@@ -41,7 +41,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp 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.resources.stringResource
import ca.gosyer.ui.base.vm.viewModel import ca.gosyer.ui.base.vm.viewModel
import ca.gosyer.util.compose.ThemedWindow import ca.gosyer.util.compose.ThemedWindow

2
src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt
View File

@@ -40,7 +40,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp 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.DownloadChapter
import ca.gosyer.data.download.model.DownloaderStatus import ca.gosyer.data.download.model.DownloaderStatus
import ca.gosyer.data.models.Chapter import ca.gosyer.data.models.Chapter

2
src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt
View File

@@ -46,7 +46,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.WindowSize import androidx.compose.ui.window.WindowSize
import androidx.compose.ui.window.rememberWindowState import androidx.compose.ui.window.rememberWindowState
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.data.models.Extension import ca.gosyer.data.models.Extension
import ca.gosyer.ui.base.WindowDialog import ca.gosyer.ui.base.WindowDialog
import ca.gosyer.ui.base.components.ActionIcon import ca.gosyer.ui.base.components.ActionIcon

2
src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt
View File

@@ -24,7 +24,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEachIndexed 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.library.model.DisplayMode
import ca.gosyer.data.models.Category import ca.gosyer.data.models.Category
import ca.gosyer.data.models.Manga import ca.gosyer.data.models.Manga

2
src/main/kotlin/ca/gosyer/ui/main/MainMenu.kt
View File

@@ -47,7 +47,7 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp 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.download.DownloadService
import ca.gosyer.data.ui.model.StartScreen import ca.gosyer.data.ui.model.StartScreen
import ca.gosyer.ui.base.components.combinedMouseClickable import ca.gosyer.ui.base.components.combinedMouseClickable

2
src/main/kotlin/ca/gosyer/ui/main/main.kt
View File

@@ -19,7 +19,7 @@ import androidx.compose.ui.input.key.key
import androidx.compose.ui.window.Window import androidx.compose.ui.window.Window
import androidx.compose.ui.window.awaitApplication import androidx.compose.ui.window.awaitApplication
import androidx.compose.ui.window.rememberWindowState import androidx.compose.ui.window.rememberWindowState
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.core.logging.initializeLogger import ca.gosyer.core.logging.initializeLogger
import ca.gosyer.data.DataModule import ca.gosyer.data.DataModule
import ca.gosyer.data.server.ServerService import ca.gosyer.data.server.ServerService

2
src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt
View File

@@ -44,7 +44,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp 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.Category
import ca.gosyer.data.models.Manga import ca.gosyer.data.models.Manga
import ca.gosyer.ui.base.WindowDialog import ca.gosyer.ui.base.WindowDialog

2
src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
View File

@@ -36,7 +36,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Window import androidx.compose.ui.window.Window
import androidx.compose.ui.window.WindowPlacement import androidx.compose.ui.window.WindowPlacement
import androidx.compose.ui.window.rememberWindowState import androidx.compose.ui.window.rememberWindowState
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.common.di.AppScope import ca.gosyer.common.di.AppScope
import ca.gosyer.data.reader.model.Direction import ca.gosyer.data.reader.model.Direction
import ca.gosyer.data.reader.model.ImageScale import ca.gosyer.data.reader.model.ImageScale

2
src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
View File

@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.Divider import androidx.compose.material.Divider
import androidx.compose.runtime.Composable 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.UiPreferences
import ca.gosyer.data.ui.model.StartScreen import ca.gosyer.data.ui.model.StartScreen
import ca.gosyer.ui.base.components.Toolbar import ca.gosyer.ui.base.components.Toolbar

2
src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt
View File

@@ -34,7 +34,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.data.models.Source import ca.gosyer.data.models.Source
import ca.gosyer.ui.base.components.ActionIcon import ca.gosyer.ui.base.components.ActionIcon
import ca.gosyer.ui.base.components.KtorImage import ca.gosyer.ui.base.components.KtorImage

2
src/main/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsMenu.kt
View File

@@ -22,7 +22,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp 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.WindowDialog
import ca.gosyer.ui.base.components.Toolbar import ca.gosyer.ui.base.components.Toolbar
import ca.gosyer.ui.base.prefs.ChoiceDialog import ca.gosyer.ui.base.prefs.ChoiceDialog

2
src/main/kotlin/ca/gosyer/util/system/File.kt
View File

@@ -6,7 +6,7 @@
package ca.gosyer.util.system package ca.gosyer.util.system
import ca.gosyer.BuildConfig import ca.gosyer.build.BuildConfig
import ca.gosyer.util.lang.launchUI import ca.gosyer.util.lang.launchUI
import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.DelicateCoroutinesApi
import mu.KotlinLogging import mu.KotlinLogging