diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2a799b80..f8bc207ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -389,7 +389,7 @@ multisrc ├── overrides │   └── │   ├── default -│   │   ├── additional.gradle.kts +│   │   ├── additional.gradle │   │   └── res │   │   ├── mipmap-hdpi │   │   │   └── ic_launcher.png @@ -403,7 +403,7 @@ multisrc │   │   │   └── ic_launcher.png │   │   └── web_hi_res_512.png │   └── -│   ├── additional.gradle.kts +│   ├── additional.gradle │   ├── AndroidManifest.xml │   ├── res │   │   ├── mipmap-hdpi @@ -439,11 +439,11 @@ multisrc - `multisrc/src/main/java/eu/kanade/tachiyomi/multisrc//.kt` defines the the theme's default implementation. - `multisrc/src/main/java/eu/kanade/tachiyomi/multisrc//Generator.kt` defines the the theme's generator class, this is similar to a `SourceFactory` class. - `multisrc/overrides//default/res` is the theme's default icons, if a source doesn't have overrides for `res`, then default icons will be used. -- `multisrc/overrides//default/additional.gradle.kts` defines additional gradle code, this will be copied at the end of all generated sources from this theme. +- `multisrc/overrides//default/additional.gradle` defines additional gradle code, this will be copied at the end of all generated sources from this theme. - `multisrc/overrides//` contains overrides for a source that is defined inside the `Generator.kt` class. - `multisrc/overrides///src` contains source overrides. - `multisrc/overrides///res` contains override for icons. -- `multisrc/overrides///additional.gradle.kts` defines additional gradle code, this will be copied at the end of the generated gradle file below the theme's `additional.gradle.kts`. +- `multisrc/overrides///additional.gradle` defines additional gradle code, this will be copied at the end of the generated gradle file below the theme's `additional.gradle`. - `multisrc/overrides///AndroidManifest.xml` is copied as an override to the default `AndroidManifest.xml` generation if it exists. ### Development workflow diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt index f232eeecd..e33e7f92b 100644 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -116,11 +116,11 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString val overridesPath = "$userDir/multisrc/overrides/$themePkg/${source.pkgName}" val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default/res" val defaultAndroidManifestPath = "$userDir/multisrc/overrides/$themePkg/default/AndroidManifest.xml" - val defaultAdditionalGradlePath = "$userDir/multisrc/overrides/$themePkg/default/additional.gradle.kts" + val defaultAdditionalGradlePath = "$userDir/multisrc/overrides/$themePkg/default/additional.gradle" val resOverridePath = "$overridesPath/res" val srcOverridePath = "$overridesPath/src" val manifestOverridePath = "$overridesPath/AndroidManifest.xml" - val additionalGradleOverridePath = "$overridesPath/additional.gradle.kts" + val additionalGradleOverridePath = "$overridesPath/additional.gradle" val projectGradleFile = File("$projectRootPath/build.gradle") val projectAndroidManifestFile = File("$projectRootPath/AndroidManifest.xml")