Skip to content
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

Minor refactoring #119

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Minor refactoring #119

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
4 changes: 3 additions & 1 deletion build-dependencies/dependencies/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ plugins {
group = "tools.forma.demo"

dependencies {
implementation("tools.forma:android")
implementation("tools.forma:deps-core")
implementation("tools.forma:owners")
implementation("tools.forma:config")

implementation("com.google.firebase:firebase-crashlytics-gradle:2.9.5")
}
5 changes: 2 additions & 3 deletions build-dependencies/dependencies/src/main/kotlin/Kotlinx.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
object kotlinx {
val coroutines_core = deps(
"org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.jetbrains.coroutines}".dep,
kotlin.stdlib
)
val coroutines_android = deps(
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.jetbrains.coroutines}".dep,
Expand All @@ -10,6 +9,6 @@ object kotlinx {

val coroutines_test = deps(
"org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.jetbrains.coroutines}".dep,
kotlinx.coroutines_core
coroutines_core
)
}
}
6 changes: 3 additions & 3 deletions build-dependencies/dependencies/src/main/kotlin/Plugins.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
import tools.forma.android.plugin.PluginWrapper
import tools.forma.android.plugin.pluginConfiguration
import tools.forma.deps.PluginWrapper
import tools.forma.deps.pluginConfiguration

object Plugins {

Expand All @@ -18,4 +18,4 @@ object Plugins {
}
)

}
}
6 changes: 3 additions & 3 deletions build-dependencies/dependencies/src/main/kotlin/Team.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import tools.forma.android.owner.Person
import tools.forma.android.owner.Team
import tools.forma.owner.Person
import tools.forma.owner.Team

object Users {
val stepango = Person(
Expand All @@ -24,4 +24,4 @@ object Teams {
Users.michaem
)
)
}
}
21 changes: 19 additions & 2 deletions build-dependencies/dependencies/src/main/kotlin/Tools.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
@file:Suppress("ClassName", "MemberVisibilityCanBePrivate")

val kotlin = tools.forma.android.dependencies.kotlin
val dataBinding = tools.forma.android.dependencies.dataBinding
import tools.forma.config.FormaConfigurationStore

object dataBinding {
val viewBinding = transitiveDeps(
"androidx.databinding:viewbinding:${FormaConfigurationStore.configuration.agpVersion}"
)

val runtime = transitiveDeps(
"androidx.databinding:databinding-runtime:${FormaConfigurationStore.configuration.agpVersion}"
)

val common = transitiveDeps(
"androidx.databinding:databinding-common:${FormaConfigurationStore.configuration.agpVersion}"
)

val adapters = transitiveDeps(
"androidx.databinding:databinding-adapters:${FormaConfigurationStore.configuration.agpVersion}"
)
}

4 changes: 2 additions & 2 deletions build-dependencies/dependencies/src/main/kotlin/ViewBinding.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
object viewbinding {
val viewBinding = transitiveDeps(
"androidx.databinding:viewbinding:${Forma.configuration.agpVersion}"
"androidx.databinding:viewbinding"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove the version?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View bindings are bundled with AGP plugin so it will use AGP platform version by default anyways.

)

val viewpropertydelegate = deps(
"com.github.kirich1409:viewbindingpropertydelegate-noreflection:${versions.viewbinding.viewbindingpropertydelegate}".dep,
"com.github.kirich1409:viewbindingpropertydelegate-core:${versions.viewbinding.viewbindingpropertydelegate}".dep,
)
}
}
2 changes: 2 additions & 0 deletions plugins/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dependencies {
implementation(project(":deps-core"))
implementation(project(":target"))
implementation(project(":validation"))
implementation(project(":owners"))
implementation(project(":config"))
}

gradlePlugin {
Expand Down
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/TargetBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.gradle.api.Project
import tools.forma.android.plugin.PluginWrapper
import tools.forma.deps.PluginWrapper

class TargetBuilder(
private val project: Project
Expand All @@ -15,4 +15,4 @@ class TargetBuilder(
return this
}

}
}
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/androidApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import tools.forma.android.feature.androidLibraryFeatureDefinition
import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.target.ApplicationTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.utils.BuildConfiguration
import tools.forma.validation.EmptyValidator
import tools.forma.android.validation.disallowResources
Expand Down
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/androidBinary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.gradle.api.Project
import tools.forma.android.feature.AndroidBinaryFeatureConfiguration
import tools.forma.android.feature.androidBinaryFeatureDefinition
import tools.forma.android.feature.applyFeatures
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.target.BinaryTargetTemplate
import tools.forma.android.utils.BuildConfiguration
import tools.forma.android.validation.disallowResources
Expand Down
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/androidLibrary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import tools.forma.android.feature.androidLibraryFeatureDefinition
import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kaptConfigurationFeature
import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.target.LibraryTargetTemplate
import tools.forma.android.utils.BuildConfiguration
import tools.forma.android.visibility.Public
Expand Down
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/androidNative.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.gradle.api.Project
import tools.forma.android.config.NdkAbi
import tools.forma.android.config.NdkBuildSystem
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.target.NativeTarget
import tools.forma.android.visibility.Public
import tools.forma.android.visibility.Visibility
Expand Down Expand Up @@ -31,4 +31,4 @@ fun Project.androidNative(
applyFeatures(
androidNativeDefinition(configuration)
)
}
}
10 changes: 4 additions & 6 deletions plugins/android/src/main/java/androidProjectConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler
import org.gradle.api.tasks.Delete
import org.gradle.kotlin.dsl.ScriptHandlerScope
import org.gradle.kotlin.dsl.repositories
import tools.forma.android.config.FormaConfiguration
import tools.forma.config.FormaConfiguration
import tools.forma.config.FormaConfigurationStore
import tools.forma.android.utils.register

// TODO: add docs for every fun param
Expand Down Expand Up @@ -105,12 +106,9 @@ fun Project.androidProjectConfiguration(
*/
object Forma {

private lateinit var _configuration: FormaConfiguration
val configuration: FormaConfiguration get() = _configuration
val configuration: FormaConfiguration get() = FormaConfigurationStore.configuration

fun store(configuration: FormaConfiguration) {
_configuration = configuration
}
fun store(configuration: FormaConfiguration) = FormaConfigurationStore.store(configuration)

val buildScriptConfiguration: ScriptHandlerScope.(List<Any>) -> Unit = { classpathDeps ->
// TODO pass repositories configuration
Expand Down
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/androidRes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.target.ResourcesTargetTemplate
import tools.forma.android.target.WidgetTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.validation.validate
import tools.forma.validation.validator
import tools.forma.android.validation.onlyAllowResources
Expand Down Expand Up @@ -44,4 +44,4 @@ fun Project.androidRes(
dependencies = dependencies,
repositoriesConfiguration = Forma.configuration.repositories
)
}
}
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/androidTestUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.target.AndroidTestUtilTargetTemplate
import tools.forma.android.target.TestUtilTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.validation.validate
import tools.forma.validation.validator
import tools.forma.android.visibility.Public
Expand Down
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/androidUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.target.AndroidUtilTargetTemplate
import tools.forma.android.target.ResourcesTargetTemplate
import tools.forma.android.target.TestUtilTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.validation.validate
import tools.forma.validation.validator
import tools.forma.android.validation.disallowResources
Expand Down Expand Up @@ -66,4 +66,4 @@ fun Project.androidUtil(
repositoriesConfiguration = Forma.configuration.repositories,
configurationFeatures = kaptConfigurationFeature()
)
}
}
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import tools.forma.android.feature.kotlinFeatureDefinition
import tools.forma.android.target.ApiTargetTemplate
import tools.forma.android.target.LibraryTargetTemplate
import tools.forma.validation.validator
import tools.forma.android.owner.Owner
import tools.forma.android.owner.NoOwner
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
Expand Down
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/dataBinding.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import tools.forma.android.target.DataBindingTargetTemplate
import tools.forma.android.target.WidgetTargetTemplate
import tools.forma.validation.validator
import tools.forma.android.validation.onlyAllowLayouts
import tools.forma.android.owner.Owner
import tools.forma.android.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.android.validation.disallowResources
import tools.forma.android.visibility.Public
import tools.forma.android.visibility.Visibility
Expand Down Expand Up @@ -120,4 +120,4 @@ private fun checkDataBindingFlag() {
if (!Forma.configuration.dataBinding) {
throw IllegalArgumentException("Please enable dataBinding feature trough androidProjectConfiguration")
}
}
}
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/library.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import tools.forma.android.feature.kotlinFeatureDefinition
import tools.forma.android.target.LibraryTargetTemplate
import tools.forma.android.target.TestUtilTargetTemplate
import tools.forma.android.target.UtilTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.validation.validator
import tools.forma.android.visibility.Public
import tools.forma.android.visibility.Visibility
Expand Down Expand Up @@ -38,4 +38,4 @@ fun Project.library(
repositoriesConfiguration = Forma.configuration.repositories,
configurationFeatures = kaptConfigurationFeature()
)
}
}
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/testUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kotlinFeatureDefinition
import tools.forma.android.target.TestUtilTargetTemplate
import tools.forma.android.target.UtilTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.validation.disallowResources
import tools.forma.validation.validator
import tools.forma.android.visibility.Public
Expand Down
25 changes: 0 additions & 25 deletions plugins/android/src/main/java/tools/forma/android/dependencies/dataBinding.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion plugins/android/src/main/java/tools/forma/android/feature/FeatureDefinition.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package tools.forma.android.feature

import Forma
import tools.forma.deps.NamedDependency
import tools.forma.android.config.FormaConfiguration
import tools.forma.config.FormaConfiguration
import emptyDependency
import kotlin.reflect.KClass
import org.gradle.api.Project
Expand Down
2 changes: 1 addition & 1 deletion plugins/android/src/main/java/tools/forma/android/feature/Kotlin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package tools.forma.android.feature

import deps
import kapt
import tools.forma.android.config.FormaConfiguration
import tools.forma.config.FormaConfiguration
import org.gradle.api.Project
import tools.forma.android.dependencies.kotlin
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
Expand Down
2 changes: 1 addition & 1 deletion plugins/android/src/main/java/tools/forma/android/utils/android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tools.forma.android.utils
import com.android.build.gradle.internal.CompileOptions
import com.android.build.gradle.internal.dsl.BuildType
import com.android.build.gradle.internal.dsl.DefaultConfig
import tools.forma.android.config.FormaConfiguration
import tools.forma.config.FormaConfiguration
import org.gradle.api.NamedDomainObjectContainer

data class BuildConfiguration(
Expand Down
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/uiLibrary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import tools.forma.android.feature.androidLibraryFeatureDefinition
import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kaptConfigurationFeature
import tools.forma.android.feature.kotlinAndroidFeatureDefinition
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.target.AndroidUtilTargetTemplate
import tools.forma.android.target.ResourcesTargetTemplate
import tools.forma.android.target.UiLibraryTargetTemplate
Expand Down
4 changes: 2 additions & 2 deletions plugins/android/src/main/java/util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import tools.forma.android.feature.applyFeatures
import tools.forma.android.feature.kotlinFeatureDefinition
import tools.forma.android.target.UtilTargetTemplate
import tools.forma.android.target.LibraryTargetTemplate
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.validation.disallowResources
import tools.forma.validation.validator
import tools.forma.android.visibility.Public
Expand Down
6 changes: 3 additions & 3 deletions plugins/android/src/main/java/viewBinding.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.gradle.api.Project
import tools.forma.android.feature.AndroidLibraryFeatureConfiguration
import tools.forma.android.feature.androidLibraryFeatureDefinition
import tools.forma.android.feature.applyFeatures
import tools.forma.android.owner.NoOwner
import tools.forma.android.owner.Owner
import tools.forma.owner.NoOwner
import tools.forma.owner.Owner
import tools.forma.android.target.LibraryTargetTemplate
import tools.forma.android.target.ResourcesTargetTemplate
import tools.forma.android.target.ViewBindingTargetTemplate
Expand Down Expand Up @@ -54,4 +54,4 @@ fun Project.viewBinding(
dependencies = dependencies,
repositoriesConfiguration = Forma.configuration.repositories
)
}
}
Loading