diff --git a/conventions/conventions/build.gradle.kts b/conventions/build.gradle.kts similarity index 97% rename from conventions/conventions/build.gradle.kts rename to conventions/build.gradle.kts index 9cc63fc9..da57bf53 100644 --- a/conventions/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -75,8 +75,8 @@ gradlePlugin { id = "td.multiplatform.app" implementationClass = "com.multiplatform.td.conventions.AndroidAppPlugin" } - register("TdBuildKonfig") { - id = "td.build.konfig" + register("TdMultiplatformBuildKonfig") { + id = "td.multiplatform.build.konfig" implementationClass = "com.multiplatform.td.conventions.BuildKonfigExtendingPlugin" } register("TdMultiplatformCommon") { diff --git a/conventions/settings.gradle.kts b/conventions/settings.gradle.kts index 54c79a39..8f4add5b 100644 --- a/conventions/settings.gradle.kts +++ b/conventions/settings.gradle.kts @@ -39,4 +39,3 @@ dependencyResolutionManagement { } rootProject.name = "TdConventions" -include(":conventions") diff --git a/conventions/conventions/src/main/kotlin/Exposed.kt b/conventions/src/main/kotlin/Exposed.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/Exposed.kt rename to conventions/src/main/kotlin/Exposed.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppKotlin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppKotlin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppKotlin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppKotlin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/BuildKonfigExtendingPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/BuildKonfigExtendingPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/BuildKonfigExtendingPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/BuildKonfigExtendingPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/CommonMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/CommonMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/CommonMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/CommonMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/FlavorExtension.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/FlavorExtension.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/FlavorExtension.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/FlavorExtension.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinTargetExtensions.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinTargetExtensions.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinTargetExtensions.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinTargetExtensions.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KspMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/KspMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KspMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/KspMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MetadataPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/MetadataPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MetadataPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/MetadataPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MokkeryMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/MokkeryMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MokkeryMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/MokkeryMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformKoverPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformKoverPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformKoverPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformKoverPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/MultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/UiMultiplatformPlugin.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/UiMultiplatformPlugin.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/UiMultiplatformPlugin.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/UiMultiplatformPlugin.kt diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt b/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt similarity index 100% rename from conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt rename to conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt diff --git a/core/environment/implementation/build.gradle.kts b/core/environment/implementation/build.gradle.kts index d277c21b..51191e23 100644 --- a/core/environment/implementation/build.gradle.kts +++ b/core/environment/implementation/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.td.multiplatform.library) alias(libs.plugins.td.multiplatform.kotlin.inject.common) - alias(libs.plugins.td.build.konfig) + alias(libs.plugins.td.multiplatform.build.konfig) } internal val `package` = "com.multiplatform.td.core.environment" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 717ae8ae..6f84da53 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -agp = "9.0.0" -androidx-activity-compose = "1.12.3" +agp = "9.0.1" +androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" androidx-core-ktx = "1.17.0" androidx-lifecycle = "2.9.6" -android-tools = "32.0.0" +android-tools = "32.0.1" androidx-test = "1.7.0" androidx-test-junit = "1.3.0" compose-multiplatform = "1.10.1" compose-material3 = "1.9.0" -compose-android = "1.10.2" +compose-android = "1.10.3" android-desugar-jdk-libs = "2.1.5" junit = "4.13.2" kotlin = "2.3.10" @@ -220,8 +220,7 @@ td-multiplatform-app = { id = "td.multiplatform.app", version = "unspecified" } td-multiplatform-common = { id = "td.multiplatform.common", version = "unspecified" } td-multiplatform-room = { id = "td.multiplatform.room", version = "unspecified" } td-multiplatform-mokkery = { id = "td.multiplatform.mokkery", version = "unspecified" } -td-multiplatform-ksp = { id = "td.multiplatform.ksp", version = "unspecified" } td-multiplatform-kotlin-inject = { id = "td.multiplatform.kotlin.inject", version = "unspecified" } td-multiplatform-kotlin-inject-common = { id = "td.multiplatform.kotlin.inject.common", version = "unspecified" } -td-build-konfig = { id = "td.build.konfig", version = "unspecified" } +td-multiplatform-build-konfig = { id = "td.multiplatform.build.konfig", version = "unspecified" } td-kover = { id = "td.multiplatform.kover", version = "unspecified" }