Forma Android v0.1.2 (#130)

stepango · web-flow · commit 0db8b2e7ac5a · 2023-07-16T10:19:23.000-07:00
diff --git a/application/settings.gradle.kts b/application/settings.gradle.kts
@@ -6,15 +6,12 @@ pluginManagement {
     includeBuild("../build-settings")
     includeBuild("../plugins")
     includeBuild("../includer")
-    includeBuild("../depgen")
 }
 
 plugins {
     id("convention-dependencies")
     id("tools.forma.includer")
     id("tools.forma.android")
-    id("tools.forma.deps")
-    id("tools.forma.depgen")
 }
 
 includer { arbitraryBuildScriptNames = true }
diff --git a/build-dependencies/dependencies/src/main/kotlin/Plugins.kt b/build-dependencies/dependencies/src/main/kotlin/Plugins.kt
@@ -1,6 +1,6 @@
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
-import tools.forma.deps.PluginWrapper
-import tools.forma.deps.pluginConfiguration
+import tools.forma.deps_core.PluginWrapper
+import tools.forma.deps_core.pluginConfiguration
 
 object Plugins {
 
diff --git a/plugins/android/build.gradle.kts b/plugins/android/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "tools.forma"
-version = "0.1.0"
+version = "0.1.2"
 
 tasks.named("compileKotlin", KotlinCompilationTask::class.java) {
     compilerOptions {
diff --git a/plugins/android/src/main/java/TargetBuilder.kt b/plugins/android/src/main/java/TargetBuilder.kt
@@ -1,5 +1,5 @@
 import org.gradle.api.Project
-import tools.forma.deps.PluginWrapper
+import tools.forma.deps_core.PluginWrapper
 
 class TargetBuilder(
         private val project: Project
diff --git a/plugins/android/src/main/java/androidApp.kt b/plugins/android/src/main/java/androidApp.kt
@@ -11,9 +11,9 @@ import tools.forma.android.validation.disallowResources
 import tools.forma.validation.validate
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
+import tools.forma.deps_core.applyDependencies
 import org.gradle.api.Project
 import tools.forma.android.feature.kaptConfigurationFeature
 
diff --git a/plugins/android/src/main/java/androidBinary.kt b/plugins/android/src/main/java/androidBinary.kt
@@ -7,8 +7,8 @@ import tools.forma.owner.Owner
 import tools.forma.android.target.BinaryTargetTemplate
 import tools.forma.android.utils.BuildConfiguration
 import tools.forma.android.validation.disallowResources
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.applyDependencies
 import tools.forma.validation.EmptyValidator
 import tools.forma.validation.validate
 
diff --git a/plugins/android/src/main/java/androidLibrary.kt b/plugins/android/src/main/java/androidLibrary.kt
@@ -10,9 +10,9 @@ import tools.forma.android.target.LibraryTargetTemplate
 import tools.forma.android.utils.BuildConfiguration
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
+import tools.forma.deps_core.applyDependencies
 import tools.forma.validation.EmptyValidator
 import tools.forma.validation.validate
 
diff --git a/plugins/android/src/main/java/androidRes.kt b/plugins/android/src/main/java/androidRes.kt
@@ -12,8 +12,8 @@ import tools.forma.android.validation.onlyAllowResources
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 
 // Only resources allowed
 fun Project.androidRes(
diff --git a/plugins/android/src/main/java/androidTestUtil.kt b/plugins/android/src/main/java/androidTestUtil.kt
@@ -11,8 +11,8 @@ import tools.forma.validation.validator
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 
 fun Project.androidTestUtil(
     packageName: String,
diff --git a/plugins/android/src/main/java/androidUtil.kt b/plugins/android/src/main/java/androidUtil.kt
@@ -14,8 +14,8 @@ import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
 import tools.forma.android.feature.kaptConfigurationFeature
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 
 /**
  * TODO
diff --git a/plugins/android/src/main/java/api.kt b/plugins/android/src/main/java/api.kt
@@ -7,8 +7,8 @@ import tools.forma.owner.Owner
 import tools.forma.owner.NoOwner
 import tools.forma.android.validation.disallowResources
 import org.gradle.api.Project
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 import tools.forma.validation.validate
 
 fun Project.api(
diff --git a/plugins/android/src/main/java/dataBinding.kt b/plugins/android/src/main/java/dataBinding.kt
@@ -19,8 +19,8 @@ import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
 import tools.forma.android.target.UiLibraryTargetTemplate
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 import tools.forma.validation.validate
 
 /**
diff --git a/plugins/android/src/main/java/impl.kt b/plugins/android/src/main/java/impl.kt
@@ -17,9 +17,9 @@ import tools.forma.android.target.UtilTargetTemplate
 import tools.forma.android.target.ViewBindingTargetTemplate
 import tools.forma.android.target.WidgetTargetTemplate
 import tools.forma.android.utils.BuildConfiguration
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
+import tools.forma.deps_core.applyDependencies
 import tools.forma.validation.validate
 import tools.forma.validation.validator
 
diff --git a/plugins/android/src/main/java/library.kt b/plugins/android/src/main/java/library.kt
@@ -10,9 +10,9 @@ import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
 import tools.forma.android.feature.kaptConfigurationFeature
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
 import tools.forma.validation.validate
 
 /**
diff --git a/plugins/android/src/main/java/testUtil.kt b/plugins/android/src/main/java/testUtil.kt
@@ -9,8 +9,8 @@ import tools.forma.validation.validator
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 import tools.forma.validation.validate
 
 fun Project.testUtil(
diff --git a/plugins/android/src/main/java/tools/forma/android/feature/FeatureDefinition.kt b/plugins/android/src/main/java/tools/forma/android/feature/FeatureDefinition.kt
@@ -1,14 +1,14 @@
 package tools.forma.android.feature
 
 import Forma
-import tools.forma.deps.NamedDependency
+import tools.forma.deps_core.NamedDependency
 import tools.forma.config.AndroidProjectSettings
 import emptyDependency
 import kotlin.reflect.KClass
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.the
-import tools.forma.deps.addDependencyTo
+import tools.forma.deps_core.addDependencyTo
 
 data class FeatureDefinition<Extension : Any, FeatureConfiguration : Any>(
     val pluginName: String,
diff --git a/plugins/android/src/main/java/tools/forma/android/feature/Kotlin.kt b/plugins/android/src/main/java/tools/forma/android/feature/Kotlin.kt
@@ -4,14 +4,13 @@ import deps
 import kapt
 import tools.forma.config.AndroidProjectSettings
 import org.gradle.api.Project
-import tools.forma.android.dependencies.kotlin
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.gradle.api.tasks.compile.JavaCompile
-import tools.forma.deps.ConfigurationType
-import tools.forma.deps.Kapt
+import tools.forma.deps_core.ConfigurationType
+import tools.forma.deps_core.Kapt
 
 private fun defaultConfiguration(project: Project, androidProjectSettings: AndroidProjectSettings) {
     project.tasks.withType(JavaCompile::class.java).configureEach {
diff --git a/plugins/android/src/main/java/uiLibrary.kt b/plugins/android/src/main/java/uiLibrary.kt
@@ -14,9 +14,9 @@ import tools.forma.android.target.WidgetTargetTemplate
 import tools.forma.android.utils.BuildConfiguration
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
+import tools.forma.deps_core.applyDependencies
 import tools.forma.validation.validate
 import tools.forma.validation.validator
 
diff --git a/plugins/android/src/main/java/util.kt b/plugins/android/src/main/java/util.kt
@@ -9,8 +9,8 @@ import tools.forma.validation.validator
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
 import tools.forma.validation.validate
 
 /**
diff --git a/plugins/android/src/main/java/viewBinding.kt b/plugins/android/src/main/java/viewBinding.kt
@@ -14,8 +14,8 @@ import tools.forma.android.target.WidgetTargetTemplate
 import tools.forma.android.validation.onlyAllowLayouts
 import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.applyDependencies
 import tools.forma.validation.validate
 import tools.forma.validation.validator
 
diff --git a/plugins/android/src/main/java/widget.kt b/plugins/android/src/main/java/widget.kt
@@ -13,9 +13,9 @@ import tools.forma.android.visibility.Public
 import tools.forma.android.visibility.Visibility
 import org.gradle.api.Project
 import tools.forma.android.target.UiLibraryTargetTemplate
-import tools.forma.deps.applyDependencies
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.NamedDependency
+import tools.forma.deps_core.applyDependencies
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.NamedDependency
 import tools.forma.validation.validate
 
 // TODO only allow layouts and view classes
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    `kotlin-dsl`
+    `kotlin-dsl-base`
     id("com.gradle.plugin-publish") version "1.2.0" apply false
 }
 
diff --git a/plugins/config/build.gradle.kts b/plugins/config/build.gradle.kts
@@ -1,7 +1,10 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("com.gradle.plugin-publish")
+    kotlin("jvm")
 }
 
 group = "tools.forma"
 version = "0.0.1"
+
+dependencies {
+    implementation(gradleApi())
+}
diff --git a/plugins/config/src/main/java/tools/forma/config/plugin/ConfigPlugin.kt b/plugins/config/src/main/java/tools/forma/config/plugin/ConfigPlugin.kt
@@ -0,0 +1,14 @@
+package tools.forma.config.plugin
+
+import org.gradle.api.Plugin
+import org.gradle.api.initialization.Settings
+
+/**
+ * We need empty plugin to be able to publish Framework to Gradle Plugins Registry
+ */
+class ConfigPlugin : Plugin<Settings> {
+
+    override fun apply(settings: Settings) {
+        return
+    }
+}
diff --git a/plugins/deps-core/build.gradle.kts b/plugins/deps-core/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    id("org.gradle.kotlin.kotlin-dsl")
-    id("com.gradle.plugin-publish")
+    kotlin("jvm")
 }
 
 group = "tools.forma"
@@ -10,4 +9,5 @@ dependencies {
     implementation(project(":validation"))
     implementation(project(":target"))
     implementation(project(":config"))
+    implementation(gradleKotlinDsl())
 }
diff --git a/plugins/deps-core/src/main/java/dependencies.kt b/plugins/deps-core/src/main/java/dependencies.kt
@@ -4,22 +4,22 @@ 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
-import tools.forma.deps.FileSpec
-import tools.forma.deps.FormaDependency
-import tools.forma.deps.Implementation
-import tools.forma.deps.Kapt
-import tools.forma.deps.MixedDependency
-import tools.forma.deps.NameSpec
-import tools.forma.deps.NamedDependency
-import tools.forma.deps.PlatformDependency
-import tools.forma.deps.PlatformSpec
-import tools.forma.deps.TargetDependency
-import tools.forma.deps.TargetSpec
+import tools.forma.deps_core.ConfigurationType
+import tools.forma.deps_core.Custom
+import tools.forma.deps_core.DepType
+import tools.forma.deps_core.EmptyDependency
+import tools.forma.deps_core.FileDependency
+import tools.forma.deps_core.FileSpec
+import tools.forma.deps_core.FormaDependency
+import tools.forma.deps_core.Implementation
+import tools.forma.deps_core.Kapt
+import tools.forma.deps_core.MixedDependency
+import tools.forma.deps_core.NameSpec
+import tools.forma.deps_core.NamedDependency
+import tools.forma.deps_core.PlatformDependency
+import tools.forma.deps_core.PlatformSpec
+import tools.forma.deps_core.TargetDependency
+import tools.forma.deps_core.TargetSpec
 import tools.forma.target.FormaTarget
 
 val DepType.names: List<NameSpec>
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/ConfigurationType.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/ConfigurationType.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import tools.forma.target.FormaTarget
 import java.io.File
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/DependencyHandler.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/DependencyHandler.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import org.gradle.api.Action
 import org.gradle.api.artifacts.ConfigurablePublishArtifact
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/FormaDependency.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/FormaDependency.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 sealed class FormaDependency(
     val dependency: DepType = emptyList()
@@ -26,4 +26,4 @@ data class MixedDependency(
     val names: List<NameSpec> = emptyList(),
     val targets: List<TargetSpec> = emptyList(),
     val files: List<FileSpec> = emptyList()
-) : FormaDependency(targets + names + files)
+) : FormaDependency(targets + names + files)
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/PluginConfiguration.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/PluginConfiguration.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import kotlin.reflect.KClass
 
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/PluginWrapper.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/PluginWrapper.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import emptyDependency
 import org.gradle.api.Project
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/androidJar.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/androidJar.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
@@ -40,4 +40,4 @@ fun findSdkLocation(project: Project): File {
         }
     }
     throw RuntimeException("Can't find SDK path")
-}
+}
diff --git a/plugins/deps-core/src/main/java/tools/forma/deps_core/applyDependencies.kt b/plugins/deps-core/src/main/java/tools/forma/deps_core/applyDependencies.kt
@@ -1,4 +1,4 @@
-package tools.forma.deps
+package tools.forma.deps_core
 
 import emptyDependency
 import forEach
diff --git a/plugins/deps/build.gradle.kts b/plugins/deps/build.gradle.kts
diff --git a/plugins/owners/build.gradle.kts b/plugins/owners/build.gradle.kts
diff --git a/plugins/target/build.gradle.kts b/plugins/target/build.gradle.kts
diff --git a/plugins/validation/build.gradle.kts b/plugins/validation/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,12 @@ pluginManagement {`
`6`	`6`	`includeBuild("../build-settings")`
`7`	`7`	`includeBuild("../plugins")`
`8`	`8`	`includeBuild("../includer")`
`9`		`- includeBuild("../depgen")`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`plugins {`
`13`	`12`	`id("convention-dependencies")`
`14`	`13`	`id("tools.forma.includer")`
`15`	`14`	`id("tools.forma.android")`
`16`		`- id("tools.forma.deps")`
`17`		`- id("tools.forma.depgen")`
`18`	`15`	`}`
`19`	`16`
`20`	`17`	`includer { arbitraryBuildScriptNames = true }`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "tools.forma"`
`11`		`-version = "0.1.0"`
	`11`	`+version = "0.1.2"`
`12`	`12`
`13`	`13`	`tasks.named("compileKotlin", KotlinCompilationTask::class.java) {`
`14`	`14`	`compilerOptions {`