From c1c0886c0d8e6f3f2f5fd0b6110d11043e079e8b Mon Sep 17 00:00:00 2001 From: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com> Date: Tue, 30 Jan 2024 18:00:36 +0500 Subject: [PATCH] remove unneeded properties from core manifest (#805) extFactory, hasReadme, hasChangelog --- common.gradle | 12 ------------ core/AndroidManifest.xml | 3 --- .../src/main/java/generator/ThemeSourceGenerator.kt | 1 - 3 files changed, 16 deletions(-) diff --git a/common.gradle b/common.gradle index d0111ba11..885a68660 100644 --- a/common.gradle +++ b/common.gradle @@ -25,22 +25,10 @@ android { base { archivesName = "tachiyomi-$applicationIdSuffix-v$versionName" } - def readmes = project.projectDir.listFiles({ File file -> - file.name == "README.md" || file.name == "CHANGELOG.md" - } as FileFilter) - def hasReadme = readmes != null && readmes.any { File file -> - file.name.startsWith("README") - } - def hasChangelog = readmes != null && readmes.any { File file -> - file.name.startsWith("CHANGELOG") - } manifestPlaceholders = [ appName : "Tachiyomi: $extName", extClass: extClass, - extFactory: project.ext.properties.getOrDefault("extFactory", ""), nsfw: project.ext.properties.getOrDefault("isNsfw", false) ? 1 : 0, - hasReadme: hasReadme ? 1 : 0, - hasChangelog: hasChangelog ? 1 : 0, ] } diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml index ed0e26f0d..b56b3b9a5 100644 --- a/core/AndroidManifest.xml +++ b/core/AndroidManifest.xml @@ -6,10 +6,7 @@ - - - diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt index 2d936c558..e383e4acf 100644 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -72,7 +72,6 @@ interface ThemeSourceGenerator { |ext { | extName = '${source.name}' | extClass = '.${source.className}' - | extFactory = '$themePkg' | extVersionCode = ${baseVersionCode + source.overrideVersionCode + multisrcLibraryVersion} | ${if (source.isNsfw) "isNsfw = true\n" else ""} |}