From 632b626f358f674485bdb375cc86c7069a5fadae Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Wed, 7 Jun 2023 08:28:34 +0000 Subject: [PATCH] chore(build): Reduce global warnings (#1684) --- buildSrc/src/main/kotlin/AndroidConfig.kt | 2 ++ core/build.gradle.kts | 2 +- lib/chillx-extractor/build.gradle.kts | 2 +- lib/chillx-extractor/src/main/AndroidManifest.xml | 2 -- multisrc/build.gradle.kts | 7 +++---- multisrc/src/main/java/generator/GeneratorMain.kt | 1 + .../java/generator/IntelijConfigurationGeneratorMain.kt | 1 + multisrc/src/main/java/generator/ThemeSourceGenerator.kt | 4 ++-- src/en/tokuzilla/AndroidManifest.xml | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 lib/chillx-extractor/src/main/AndroidManifest.xml diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index ad4d8b76f..5e3f111b5 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -3,4 +3,6 @@ object AndroidConfig { const val minSdk = 21 const val targetSdk = 32 const val namespace = "eu.kanade.tachiyomi.animeextension" + const val coreNamespace = "eu.kanade.tachiyomi.lib.core" + const val multisrcNamespace = "eu.kanade.tachiyomi.lib.themesources" } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 41e4ad3b0..dcd5b361d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -4,7 +4,7 @@ plugins { android { compileSdk = AndroidConfig.compileSdk - namespace = AndroidConfig.namespace + namespace = AndroidConfig.coreNamespace defaultConfig { minSdk = AndroidConfig.minSdk diff --git a/lib/chillx-extractor/build.gradle.kts b/lib/chillx-extractor/build.gradle.kts index 659c0c011..c2d02170b 100644 --- a/lib/chillx-extractor/build.gradle.kts +++ b/lib/chillx-extractor/build.gradle.kts @@ -15,4 +15,4 @@ android { dependencies { compileOnly(libs.bundles.common) } -// BUMPS: 0 \ No newline at end of file +// BUMPS: 0 diff --git a/lib/chillx-extractor/src/main/AndroidManifest.xml b/lib/chillx-extractor/src/main/AndroidManifest.xml deleted file mode 100644 index c164eb6ee..000000000 --- a/lib/chillx-extractor/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index ca7995fb4..fe890de21 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -6,11 +6,10 @@ plugins { android { compileSdk = AndroidConfig.compileSdk - namespace = "eu.kanade.tachiyomi.lib.themesources" + namespace = AndroidConfig.multisrcNamespace defaultConfig { minSdk = 29 - targetSdk = AndroidConfig.targetSdk } kotlinOptions { @@ -36,9 +35,9 @@ dependencies { } tasks { - val generateExtensions by registering { + register("generateExtensions") { doLast { - val isWindows = System.getProperty("os.name").toString().toLowerCase().contains("win") + val isWindows = System.getProperty("os.name").toString().lowercase().contains("win") var classPath = ( configurations.compileOnly.get().asFileTree.toList() + listOf( diff --git a/multisrc/src/main/java/generator/GeneratorMain.kt b/multisrc/src/main/java/generator/GeneratorMain.kt index fb29c8cfa..1fc231b92 100644 --- a/multisrc/src/main/java/generator/GeneratorMain.kt +++ b/multisrc/src/main/java/generator/GeneratorMain.kt @@ -5,6 +5,7 @@ import java.io.File /** * Finds and calls all `ThemeSourceGenerator`s */ +@Suppress("unused_parameter") fun main(args: Array) { val userDir = System.getProperty("user.dir")!! val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc" diff --git a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt index 98cd1a764..d8e435980 100644 --- a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt +++ b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt @@ -6,6 +6,7 @@ import java.io.File * Finds all themes and creates an Intellij Idea run configuration for their generators * Should be run after creation/deletion of each theme */ +@Suppress("unused_parameter") fun main(args: Array) { val userDir = System.getProperty("user.dir")!! val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc" diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt index 0d1858f52..92afd47b2 100644 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -142,7 +142,7 @@ interface ThemeSourceGenerator { writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass) copyThemeClasses(userDir, themePkg, projectRootPath) copyThemeReadmes(userDir, themePkg, overridesPath, projectRootPath) - copyResFiles(resOverridePath, defaultResPath, source, projectRootPath) + copyResFiles(resOverridePath, defaultResPath, projectRootPath) } } @@ -182,7 +182,7 @@ interface ThemeSourceGenerator { } } - private fun copyResFiles(resOverridePath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any { + private fun copyResFiles(resOverridePath: String, defaultResPath: String, projectRootPath: String): Any { // check if res override exists if not copy default res val resOverride = File(resOverridePath) return if (resOverride.exists()) { diff --git a/src/en/tokuzilla/AndroidManifest.xml b/src/en/tokuzilla/AndroidManifest.xml index acb4de356..8072ee00d 100644 --- a/src/en/tokuzilla/AndroidManifest.xml +++ b/src/en/tokuzilla/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file +