From 256969473d675235695c8e3cb941168a585940a8 Mon Sep 17 00:00:00 2001 From: Maxwell Mapako Date: Tue, 4 Apr 2023 20:51:59 +0200 Subject: [PATCH] refactor/buildSrc module name correction (#558) * Correct buildSrc module module name type * Update version.json * Remove dangling import --- app/.meta/version.json | 2 +- .../buildsrc/{componets => components}/AndroidComponents.kt | 2 +- .../buildsrc/{componets => components}/PluginComponents.kt | 2 +- .../{componets => components}/ProjectDependencies.kt | 2 +- .../{componets => components}/PropertiesComponents.kt | 2 +- .../mxt/anitrend/buildsrc/extensions/ProjectExtensions.kt | 2 +- .../main/java/com/mxt/anitrend/buildsrc/plugin/CorePlugin.kt | 5 ++++- 7 files changed, 10 insertions(+), 7 deletions(-) rename buildSrc/src/main/java/com/mxt/anitrend/buildsrc/{componets => components}/AndroidComponents.kt (99%) rename buildSrc/src/main/java/com/mxt/anitrend/buildsrc/{componets => components}/PluginComponents.kt (95%) rename buildSrc/src/main/java/com/mxt/anitrend/buildsrc/{componets => components}/ProjectDependencies.kt (99%) rename buildSrc/src/main/java/com/mxt/anitrend/buildsrc/{componets => components}/PropertiesComponents.kt (94%) diff --git a/app/.meta/version.json b/app/.meta/version.json index bcf7e585c..c4608525f 100644 --- a/app/.meta/version.json +++ b/app/.meta/version.json @@ -1,7 +1,7 @@ { "code": 1010000000, "migration": false, - "minSdk": 17, + "minSdk": 21, "releaseNotes": "", "version": "1.10.0", "appId": "com.mxt.anitrend" diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/AndroidComponents.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/AndroidComponents.kt similarity index 99% rename from buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/AndroidComponents.kt rename to buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/AndroidComponents.kt index 0cee1d62b..e3712cfd1 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/AndroidComponents.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/AndroidComponents.kt @@ -16,7 +16,7 @@ */ @file:Suppress("UnstableApiUsage") -package com.mxt.anitrend.buildsrc.componets +package com.mxt.anitrend.buildsrc.components import com.android.build.gradle.BaseExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PluginComponents.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PluginComponents.kt similarity index 95% rename from buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PluginComponents.kt rename to buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PluginComponents.kt index 6e2762940..3e961726b 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PluginComponents.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PluginComponents.kt @@ -1,4 +1,4 @@ -package com.mxt.anitrend.buildsrc.componets +package com.mxt.anitrend.buildsrc.components import com.mxt.anitrend.buildsrc.extensions.baseExtension import org.gradle.api.Project diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/ProjectDependencies.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/ProjectDependencies.kt similarity index 99% rename from buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/ProjectDependencies.kt rename to buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/ProjectDependencies.kt index 53e7a001d..a99c77a56 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/ProjectDependencies.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/ProjectDependencies.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.mxt.anitrend.buildsrc.componets +package com.mxt.anitrend.buildsrc.components import org.gradle.api.Project import com.mxt.anitrend.buildsrc.extensions.* diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PropertiesComponents.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt similarity index 94% rename from buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PropertiesComponents.kt rename to buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt index 65f0c96db..c926bab07 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/PropertiesComponents.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt @@ -1,4 +1,4 @@ -package com.mxt.anitrend.buildsrc.componets +package com.mxt.anitrend.buildsrc.components import org.gradle.api.Project import java.io.File diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/extensions/ProjectExtensions.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/extensions/ProjectExtensions.kt index b0de7fc14..00740c6ec 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/extensions/ProjectExtensions.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/extensions/ProjectExtensions.kt @@ -19,7 +19,7 @@ package com.mxt.anitrend.buildsrc.extensions import com.android.build.gradle.BaseExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension -import com.mxt.anitrend.buildsrc.componets.PropertiesReader +import com.mxt.anitrend.buildsrc.components.PropertiesReader import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.kotlin.dsl.getByType diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/plugin/CorePlugin.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/plugin/CorePlugin.kt index 561f00c30..ad5c0ecf3 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/plugin/CorePlugin.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/plugin/CorePlugin.kt @@ -17,9 +17,12 @@ package com.mxt.anitrend.buildsrc.plugin +import com.mxt.anitrend.buildsrc.components.applyAndroidConfiguration +import com.mxt.anitrend.buildsrc.components.configureAdditionalPlugins +import com.mxt.anitrend.buildsrc.components.configureDependencies +import com.mxt.anitrend.buildsrc.components.configurePlugins import org.gradle.api.Plugin import org.gradle.api.Project -import com.mxt.anitrend.buildsrc.componets.* open class CorePlugin : Plugin {