Skip to content

Respected IDE specified minimum SDK version. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EranBoudjnah merged 1 commit into from
Oct 3, 2025
Merged

Respected IDE specified minimum SDK version. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli/src/main/kotlin/com/mitteloupe/cag/cli/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ fun main(arguments: Array<String>) {
destinationRootDirectory = projectTemplateDestinationDirectory,
projectName = request.projectName,
packageName = request.packageName,
overrideMinimumAndroidSdk = null,
enableCompose = request.enableCompose,
enableKtlint = request.enableKtlint,
enableDetekt = request.enableDetekt,
Expand Down
19 changes: 17 additions & 2 deletions core/src/main/kotlin/com/mitteloupe/cag/core/Generator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.mitteloupe.cag.core.generation.architecture.CoroutineModuleContentGen
import com.mitteloupe.cag.core.generation.versioncatalog.DependencyConfiguration
import com.mitteloupe.cag.core.generation.versioncatalog.LibraryConstants
import com.mitteloupe.cag.core.generation.versioncatalog.PluginConstants
import com.mitteloupe.cag.core.generation.versioncatalog.SectionEntryRequirement
import com.mitteloupe.cag.core.generation.versioncatalog.VersionCatalogConstants
import com.mitteloupe.cag.core.generation.versioncatalog.VersionCatalogUpdater
import com.mitteloupe.cag.core.generation.withoutSpaces
Expand All @@ -37,7 +38,6 @@ import com.mitteloupe.cag.core.request.GenerateProjectTemplateRequest
import com.mitteloupe.cag.core.request.GenerateUseCaseRequest
import com.mitteloupe.cag.core.request.GenerateViewModelRequest
import java.io.File
import kotlin.String

class Generator(
private val gradleFileCreator: GradleFileCreator,
Expand Down Expand Up @@ -434,9 +434,24 @@ class Generator(
add(PluginConstants.DETEKT)
}
}
val overrideVersions =
if (request.overrideMinimumAndroidSdk == null) {
VersionCatalogConstants.ANDROID_VERSIONS
} else {
VersionCatalogConstants.ANDROID_VERSIONS.map { androidVersion ->
if (androidVersion.key == VersionCatalogConstants.MIN_SDK_VERSION.key) {
SectionEntryRequirement.VersionRequirement(
key = androidVersion.key,
version = request.overrideMinimumAndroidSdk.toString()
)
} else {
androidVersion
}
}
}
val dependencyConfiguration =
DependencyConfiguration(
versions = VersionCatalogConstants.ANDROID_VERSIONS,
versions = overrideVersions,
libraries = libraries,
plugins = plugins
)
Expand Down
11 changes: 6 additions & 5 deletions core/src/main/kotlin/com/mitteloupe/cag/core/request/GenerateProjectTemplateRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ data class GenerateProjectTemplateRequest(
val destinationRootDirectory: File,
val projectName: String,
val packageName: String,
val enableCompose: Boolean = true,
val enableKtlint: Boolean = false,
val enableDetekt: Boolean = false,
val enableKtor: Boolean = false,
val enableRetrofit: Boolean = false
val overrideMinimumAndroidSdk: Int?,
val enableCompose: Boolean,
val enableKtlint: Boolean,
val enableDetekt: Boolean,
val enableKtor: Boolean,
val enableRetrofit: Boolean
)
8 changes: 8 additions & 0 deletions ...e/cag/cleanarchitecturegenerator/projectwizard/CleanArchitectureWizardTemplateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,19 @@ class CleanArchitectureWizardTemplateProvider : WizardTemplateProvider() {
enableRetrofit: BooleanParameter,
initializeGitRepository: BooleanParameter
) {
val selectedMinSdk: Int? =
try {
data.apis.minApi.apiLevel
} catch (_: Exception) {
null
}

val request =
GenerateProjectTemplateRequest(
destinationRootDirectory = projectRootDirectory,
projectName = readProjectName(projectRootDirectory.name),
packageName = data.packageName,
overrideMinimumAndroidSdk = selectedMinSdk,
enableCompose = enableCompose.value,
enableKtlint = enableKtlint.value,
enableDetekt = enableDetekt.value,
Expand Down