ksp milestone 3

Author: stepango

application/build.gradle.kts

@@ -13,3 +13,5 @@ buildscript {
         )
     )
 }
+
+Forma.registerConfiguration("ksp", libs.plugins.devtools.ksp, libs.room.compiler)

application/settings.gradle.kts

@@ -69,10 +69,12 @@ fun VersionCatalogBuilder.addPlugin(
     notation: String,
     version: String,
     vararg dependencies: String,
-    nameGenerator: (String) -> String = ::pluginNameGenerator
+    nameGenerator: (String) -> String = ::pluginNameGenerator,
+    depNameGenerator: (String) -> String = ::defaultNameGenerator
 ) {
     val name = nameGenerator(notation)
     plugin(name, notation).version { strictly(version) }
+    dependencies.forEach { addLibrary(it, depNameGenerator) }
 }
 
 // todo split lib name and version

plugins/android/src/main/java/androidProjectConfiguration.kt

@@ -9,6 +9,7 @@ import tools.forma.android.utils.register
 import tools.forma.config.SettingsStore
 import tools.forma.config.AndroidProjectSettings
 import tools.forma.config.FormaSettingsStore
+import tools.forma.config.PluginInfoStore
 
 // TODO: add docs for every fun param
 /**
@@ -124,4 +125,4 @@ val buildScriptConfiguration: ScriptHandlerScope.(List<Any>) -> Unit = { classpa
  * Singleton project configuration store
  * TODO remove
  */
-object Forma: SettingsStore<AndroidProjectSettings> by FormaSettingsStore
+object Forma: SettingsStore<AndroidProjectSettings> by FormaSettingsStore, PluginInfoStore by FormaSettingsStore

plugins/android/src/main/java/tools/forma/android/dependencies/kotlin.kt

@@ -15,22 +15,6 @@ object jetbrains {
 }
 
 object kotlin {
-    val stdlib_common =
-        "org.jetbrains.kotlin:kotlin-stdlib-common:${Forma.settings.kotlinVersion}".dep
-    val stdlib =
-        deps(
-            "org.jetbrains.kotlin:kotlin-stdlib:${Forma.settings.kotlinVersion}".dep,
-            jetbrains.annotations,
-            stdlib_common
-        )
-    val stdlib_jdk7 =
-        deps("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Forma.settings.kotlinVersion}".dep, stdlib)
-    val stdlib_jdk8 =
-        deps(
-            "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Forma.settings.kotlinVersion}".dep,
-            stdlib,
-            stdlib_jdk7
-        )
     val reflect =
-        deps("org.jetbrains.kotlin:kotlin-reflect:${Forma.settings.kotlinVersion}".dep, stdlib)
+        deps("org.jetbrains.kotlin:kotlin-reflect:${Forma.settings.kotlinVersion}".dep)
 }

plugins/android/src/main/java/tools/forma/android/feature/Kotlin.kt

@@ -27,7 +27,6 @@ fun kotlinFeatureDefinition() = FeatureDefinition(
     pluginName = "kotlin",
     pluginExtension = KotlinJvmProjectExtension::class,
     featureConfiguration = {},
-    defaultDependencies = kotlin.stdlib_jdk8,
     configuration = featureConfiguration()
 )
 
@@ -43,15 +42,14 @@ fun kotlinAndroidFeatureDefinition() = FeatureDefinition(
     pluginName = "kotlin-android",
     pluginExtension = KotlinAndroidProjectExtension::class,
     featureConfiguration = {},
-    defaultDependencies = kotlin.stdlib_jdk8,
     configuration = featureConfiguration()
 )
 
 fun kotlinKaptFeatureDefinition() = FeatureDefinition(
     pluginName = "kotlin-kapt",
     pluginExtension = KaptExtension::class,
     featureConfiguration = {},
-    defaultDependencies = deps(kotlin.stdlib_jdk8, "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0".kapt),
+    defaultDependencies = deps("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0".kapt),
     configuration = featureConfiguration()
 )
 

plugins/config/src/main/java/tools/forma/config/AndroidProjectSettings.kt

@@ -5,6 +5,9 @@ import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.provider.Provider
 import org.gradle.plugin.use.PluginDependency
+import tools.forma.config.FormaSettingsStore.configurations
+import tools.forma.config.FormaSettingsStore.dependencies
+import tools.forma.config.FormaSettingsStore.dependencyPlugins
 
 /**
  * Limitations:
@@ -49,8 +52,8 @@ object FormaSettingsStore : SettingsStore<AndroidProjectSettings>, PluginInfoSto
     }
 
     override val plugins: MutableMap<Provider<PluginDependency>, PluginConfiguration> = mutableMapOf()
-    override val dependencyPlugins: MutableMap<Provider<Dependency>, PluginConfiguration> = mutableMapOf()
-    override val dependencies: MutableMap<Provider<Dependency>, DependencyConfiguration> = mutableMapOf()
+    override val dependencyPlugins: MutableMap<Provider<out Dependency>, PluginConfiguration> = mutableMapOf()
+    override val dependencies: MutableMap<Provider<out Dependency>, DependencyConfiguration> = mutableMapOf()
     override val configurations: MutableMap<String, Provider<PluginDependency>> = mutableMapOf()
 }
 
@@ -60,19 +63,27 @@ interface SettingsStore<T : Any> {
 }
 
 data class PluginConfiguration(val plugin: Provider<PluginDependency>, val configuration: String)
-data class DependencyConfiguration(val dependency: Provider<Dependency>, val configuration: String)
+data class DependencyConfiguration(val dependency: Provider<out Dependency>, val configuration: String)
 
 interface PluginInfoStore {
     val plugins: MutableMap<Provider<PluginDependency>, PluginConfiguration>
-    val dependencyPlugins: MutableMap<Provider<Dependency>, PluginConfiguration>
-    val dependencies: MutableMap<Provider<Dependency>, DependencyConfiguration>
+    val dependencyPlugins: MutableMap<Provider<out Dependency>, PluginConfiguration>
+    val dependencies: MutableMap<Provider<out Dependency>, DependencyConfiguration>
     val configurations: MutableMap<String, Provider<PluginDependency>>
+
+    fun registerConfiguration(configuration: String, plugin: Provider<PluginDependency>, vararg dependencies: Provider<out Dependency>) {
+        registerPlugin(plugin, configuration)
+
+        dependencies.forEach { dependency ->
+            registerDependency(dependency, configuration)
+        }
+    }
     fun registerPlugin(plugin: Provider<PluginDependency>, configuration: String){
         configurations[configuration] = plugin
         plugins[plugin] = PluginConfiguration(plugin, configuration)
     }
 
-    fun registerDependency(dependency: Provider<Dependency>, configuration: String){
+    fun registerDependency(dependency: Provider<out Dependency>, configuration: String){
         if (configurations.containsKey(configuration)) {
             dependencyPlugins[dependency] = plugins[configurations[configuration]!!]!!
             dependencies[dependency] = DependencyConfiguration(dependency, configuration)
@@ -81,5 +92,5 @@ interface PluginInfoStore {
         }
     }
 
-    fun getPlugin(dependency: Provider<Dependency>): PluginConfiguration? = dependencyPlugins[dependency]
+    fun pluginFor(dependency: Provider<out Dependency>): PluginConfiguration? = dependencyPlugins[dependency]
 }

plugins/deps-core/build.gradle.kts

@@ -9,4 +9,5 @@ version = "0.0.1"
 dependencies {
     implementation(project(":validation"))
     implementation(project(":target"))
+    implementation(project(":config"))
 }

plugins/deps-core/src/main/java/dependencies.kt

@@ -3,7 +3,9 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ExternalModuleDependencyBundle
 import org.gradle.api.provider.Provider
+import tools.forma.config.FormaSettingsStore
 import tools.forma.deps.ConfigurationType
+import tools.forma.deps.Custom
 import tools.forma.deps.DepType
 import tools.forma.deps.EmptyDependency
 import tools.forma.deps.FileDependency
@@ -29,8 +31,16 @@ val DepType.targets: List<TargetSpec>
 val DepType.files: List<FileSpec>
     get(): List<FileSpec> = filterIsInstance(FileSpec::class.java)
 
-val <T : Dependency> Provider<T>.dep: NameSpec
-    get() = with(get()) { NameSpec("$group:$name:$version", Implementation) }
+val Provider<out Dependency>.dep: NameSpec
+    get() {
+        val pluginConf = FormaSettingsStore.pluginFor(this)
+        return with(get()) {
+            NameSpec(
+                "$group:$name:$version",
+                pluginConf?.configuration?.let(::Custom) ?: Implementation
+            )
+        }
+    }
 
 val Dependency.dep: NameSpec
     get() = NameSpec("$group:$name:$version", Implementation)
@@ -108,10 +118,13 @@ fun deps(vararg dependencies: NamedDependency): NamedDependency =
 
 fun deps(vararg dependencies: Provider<*>): NamedDependency =
     dependencies
-        .map { it.get() }
-        .flatMap { source ->
+        .flatMap { provider ->
+            val source = provider.get()
+            @Suppress("UNCHECKED_CAST")
             when (source) {
-                is Dependency -> listOf(source.dep)
+                // here we need to call .dep on provider to get the correct configuration
+                // since on configuration phase we don't have the actual dependency
+                is Dependency -> listOf((provider as Provider<Dependency>).dep)
                 is ExternalModuleDependencyBundle -> source.map { it.dep }
                 else ->
                     throw IllegalArgumentException(