Add some Gradle DI glue to be usable from Groovy scripts

Author: ilya-g

main/src/kotlinx/team/infra/InfraExtension.kt

@@ -4,7 +4,7 @@ import kotlinx.team.infra.api.*
 import org.gradle.api.*
 
 open class InfraExtension(val project: Project) {
-    val publishing = PublishingConfiguration()
+    val publishing = project.objects.newInstance<PublishingConfiguration>()
     private var publishingHandler: ((PublishingConfiguration) -> Unit)? = null
     internal fun afterPublishing(handler: (PublishingConfiguration) -> Unit) {
         publishingHandler = handler
@@ -15,7 +15,7 @@ open class InfraExtension(val project: Project) {
         publishingHandler?.invoke(publishing)
     }
 
-    val teamcity = TeamCityConfiguration()
+    val teamcity = project.objects.newInstance<TeamCityConfiguration>()
     private var teamcityHandler: ((TeamCityConfiguration) -> Unit)? = null
     internal fun afterTeamCity(handler: (TeamCityConfiguration) -> Unit) {
         teamcityHandler = handler
@@ -26,7 +26,7 @@ open class InfraExtension(val project: Project) {
         teamcityHandler?.invoke(teamcity)
     }
 
-    val apiCheck = ApiCheckConfiguration()
+    val apiCheck = project.objects.newInstance<ApiCheckConfiguration>()
     private var apiCheckHandler: ((ApiCheckConfiguration) -> Unit)? = null
     internal fun afterApiCheck(handler: (ApiCheckConfiguration) -> Unit) {
         apiCheckHandler = handler

main/src/kotlinx/team/infra/Publishing.kt

@@ -2,6 +2,7 @@ package kotlinx.team.infra
 
 import groovy.lang.*
 import org.gradle.api.*
+import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.*
 import org.gradle.api.publish.*
 import org.gradle.api.publish.maven.MavenPom
@@ -17,12 +18,13 @@ import org.gradle.util.*
 import java.net.*
 import java.text.*
 import java.util.*
+import javax.inject.Inject
 
 @Suppress("DEPRECATION")
-open class PublishingConfiguration {
+open class PublishingConfiguration @Inject constructor(val objects: ObjectFactory) {
     var libraryRepoUrl: String? = null
 
-    val sonatype = SonatypeConfiguration()
+    val sonatype = objects.newInstance<SonatypeConfiguration>()
     fun sonatype(configure: Action<SonatypeConfiguration>) {
         configure.execute(sonatype)
         sonatype.isSelected = true
@@ -58,14 +60,16 @@ open class PublishingConfiguration {
     }
 }
 
-class SonatypeConfiguration {
+open class SonatypeConfiguration {
     // no things to configure here for now
     // all information is provided with properties or env. variables with known names:
     // - libs.repository.id: sonatype staging repository id, 'auto' to open staging implicitly,
     // - libs.sonatype.user: sonatype user name
     // - libs.sonatype.password: sonatype password
     // - libs.sign.key.id, libs.sign.key.private, libs.sign.passphrase: publication signing information
     internal var isSelected: Boolean = false
+
+    public var testProperty: String = "default"
 }
 
 // TODO: Add space configuration

main/src/kotlinx/team/infra/TeamCity.kt

@@ -3,7 +3,7 @@ package kotlinx.team.infra
 import org.gradle.api.*
 import java.io.*
 
-class TeamCityConfiguration {
+open class TeamCityConfiguration {
     var libraryStagingRepoDescription: String? = null
 
     @Deprecated("Avoid publishing to bintray")

main/src/kotlinx/team/infra/Utils.kt

@@ -3,6 +3,7 @@ package kotlinx.team.infra
 import groovy.lang.*
 import org.gradle.api.*
 import org.gradle.api.logging.*
+import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.*
 import java.io.*
 
@@ -58,4 +59,6 @@ fun Logger.infra(message: String) {
 }
 
 fun Project.propertyOrEnv(name: String): String? =
-    findProperty(name) as? String ?: System.getenv(name)
+    findProperty(name) as? String ?: System.getenv(name)
+
+internal inline fun <reified T: Any> ObjectFactory.newInstance(): T = newInstance(T::class.java)

main/src/kotlinx/team/infra/api/ApiCheck.kt

@@ -9,7 +9,7 @@ import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.*
 
-class ApiCheckConfiguration {
+open class ApiCheckConfiguration {
     var includeProjects: MutableList<String> = mutableListOf()
     fun include(vararg name: String) {
         includeProjects.addAll(name)