extract remaining modules (clr, assembly, assembly-bundle, nunit, vs,…

… unity, local-repository, lib-consumer)

build.gradle

@@ -24,22 +24,20 @@ subprojects {
 		compile gradleApi()
 		groovy localGroovy()
 		def spockframework = 'org.spockframework:spock-core:0.7-groovy-1.8'
-		testCompile spockframework
 		if (project.name == 'testing') {
 			compile spockframework
 		} else {
 			testCompile project(':testing')
 		}
+		testCompile spockframework
 	}
 
 	task publish(dependsOn: [test, uploadArchives])
 }
 
 dependencies {
-	subprojects.each {
-		if (it.name != 'testing') {
-			'default' project(path: it.path)
-		}
+	subprojects.findAll { it.name != 'testing' }.each {
+		'default' project(path: it.path)
 	}
 }
 

plugins/assembly-bundle/build.gradle

@@ -0,0 +1,7 @@
+version = '0.1.0'
+
+dependencies {
+	[':assembly', ':unity', ':local-repository', ':lib-consumer'].each {
+		compile project(it)
+	}
+}

plugins/core/src/main/groovy/kaizen/plugins/BundlePlugin.groovy → plugins/assembly-bundle/src/main/groovy/kaizen/plugins/assembly/bundle/BundlePlugin.groovy

@@ -1,5 +1,7 @@
-package kaizen.plugins
+package kaizen.plugins.assembly.bundle
 
+import kaizen.plugins.LibClientPlugin
+import kaizen.plugins.LocalRepositoryPlugin
 import kaizen.plugins.unity.UnityPlugin
 import org.gradle.api.Project
 import org.gradle.api.Plugin

plugins/assembly-bundle/src/main/resources/META-INF/gradle-plugins/assembly-bundle.properties

@@ -0,0 +1 @@
+implementation-class=kaizen.plugins.assembly.bundle.BundlePlugin

plugins/core/src/test/groovy/kaizen/plugins/AssemblyCompilationSpec.groovy → plugins/assembly-bundle/src/test/groovy/kaizen/plugins/assembly/bundle/AssemblyBundleCompilationSpec.groovy

@@ -1,6 +1,8 @@
-package kaizen.plugins
+package kaizen.plugins.assembly.bundle
 
-class AssemblyCompilationSpec extends BundleSpecification {
+import kaizen.testing.BundleSpecification
+
+class AssemblyBundleCompilationSpec extends BundleSpecification {
 
 	def depender = subProjectWithName('depender')
 	def dependee = subProjectWithName('dependee')
@@ -15,7 +17,7 @@ class AssemblyCompilationSpec extends BundleSpecification {
 				editor project(dependee.path)
 			}
 		}
-		bundle.apply plugin: BundlePlugin
+		bundle.apply plugin: 'assembly-bundle'
 		evaluateBundle()
 	}
 

plugins/assembly/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+	compile project(':conventions')
+}

plugins/core/src/main/groovy/kaizen/plugins/assembly/AssemblyCompileTask.groovy → plugins/assembly/src/main/groovy/kaizen/plugins/assembly/AssemblyCompileTask.groovy

@@ -2,7 +2,7 @@ package kaizen.plugins.assembly
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
-import kaizen.plugins.core.Configurations
+import kaizen.plugins.conventions.Configurations
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ProjectDependency
 
@@ -48,7 +48,11 @@ class AssemblyCompileTask extends DefaultTask {
 			new File(resolvedOutputDir, assemblyFileNameFor(it))
 		}
 
-		def unity = project.rootProject.unity
+		// TODO: remove dependency on unity
+		def unity = project.rootProject.extensions.findByName('unity')
+		if (unity == null)
+			return
+
 		def mono = unity.mono
 		def assembly = project.assembly
 		def keyFile = assembly.keyFile

plugins/core/src/main/groovy/kaizen/plugins/assembly/AssemblyPlugin.groovy → plugins/assembly/src/main/groovy/kaizen/plugins/assembly/AssemblyPlugin.groovy

@@ -1,6 +1,6 @@
 package kaizen.plugins.assembly
 
-import kaizen.plugins.core.Configurations
+import kaizen.plugins.conventions.Configurations
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration

plugins/core/src/test/groovy/kaizen/plugins/AssemblyPluginSpec.groovy → plugins/assembly/src/test/groovy/kaizen/plugins/assembly/AssemblyPluginSpec.groovy

@@ -1,6 +1,5 @@
-package kaizen.plugins
+package kaizen.plugins.assembly
 
-import kaizen.plugins.assembly.AssemblyPlugin
 import kaizen.testing.PluginSpecification
 
 class AssemblyPluginSpec extends PluginSpecification {

plugins/core/src/test/groovy/kaizen/plugins/AssemblyWithCustomConfiguration.groovy → plugins/assembly/src/test/groovy/kaizen/plugins/assembly/AssemblyWithCustomConfiguration.groovy

@@ -1,6 +1,6 @@
-package kaizen.plugins
+package kaizen.plugins.assembly
 
-import kaizen.plugins.assembly.AssemblyPlugin
+import kaizen.testing.BasePluginInfo
 import kaizen.testing.PluginSpecification
 
 class AssemblyWithCustomConfiguration extends PluginSpecification {

plugins/clr/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+	compile project(':foundation')
+}

plugins/conventions/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+	project(':conventions')
+}

plugins/core/src/main/groovy/kaizen/plugins/core/Configurations.groovy → plugins/conventions/src/main/groovy/kaizen/plugins/conventions/Configurations.groovy

@@ -1,4 +1,4 @@
-package kaizen.plugins.core
+package kaizen.plugins.conventions
 
 import org.gradle.api.artifacts.Configuration
 

plugins/lib-consumer/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+	compile project(':conventions')
+}

plugins/core/src/main/groovy/kaizen/plugins/UpdateTask.groovy → plugins/lib-consumer/src/main/groovy/kaizen/plugins/UpdateTask.groovy

@@ -3,7 +3,8 @@ package kaizen.plugins
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.tasks.TaskAction
-import kaizen.plugins.core.Configurations
+
+import kaizen.plugins.conventions.Configurations
 
 class UpdateTask extends DefaultTask {
 

plugins/local-repository/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+	compile project(':conventions')
+}

plugins/local-repository/src/main/groovy/kaizen/plugins/LocalRepositoryExtension.groovy

@@ -0,0 +1,5 @@
+package kaizen.plugins
+
+class LocalRepositoryExtension {
+	def location = '../repository'
+}

plugins/core/src/main/groovy/kaizen/plugins/LocalRepositoryPlugin.groovy → plugins/local-repository/src/main/groovy/kaizen/plugins/LocalRepositoryPlugin.groovy

@@ -3,7 +3,7 @@ package kaizen.plugins
 import org.gradle.api.Project
 import org.gradle.api.Plugin
 import org.gradle.util.ConfigureUtil
-import kaizen.plugins.core.Configurations
+import kaizen.plugins.conventions.Configurations
 
 class LocalRepositoryPlugin implements Plugin<Project> {
 
@@ -44,6 +44,3 @@ class LocalRepositoryPlugin implements Plugin<Project> {
 	}
 }
 
-class LocalRepositoryExtension {
-	def location = '../repository'
-}

plugins/nunit/build.gradle

@@ -0,0 +1,7 @@
+version = '0.1.0'
+
+dependencies {
+	[':clr', ':assembly', ':lib-consumer', ':conventions'].each {
+		compile project(it)
+	}
+}

plugins/core/src/main/groovy/kaizen/plugins/nunit/NUnitAssemblyPlugin.groovy → plugins/nunit/src/main/groovy/kaizen/plugins/nunit/NUnitAssemblyPlugin.groovy

@@ -3,7 +3,7 @@ package kaizen.plugins.nunit
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.util.ConfigureUtil
-import kaizen.plugins.core.Configurations
+import kaizen.plugins.conventions.Configurations
 import kaizen.plugins.assembly.AssemblyCompileTask
 import org.gradle.api.Task
 

plugins/core/src/test/groovy/kaizen/plugins/NUnitPluginSpec.groovy → plugins/nunit/src/test/groovy/kaizen/plugins/nunit/NUnitPluginSpec.groovy

@@ -1,8 +1,7 @@
-package kaizen.plugins
+package kaizen.plugins.nunit
 
 import kaizen.testing.PluginSpecification
 import org.gradle.api.Project
-import kaizen.plugins.nunit.NUnitPlugin
 import org.gradle.api.internal.project.ProjectInternal
 
 class NUnitPluginSpec extends PluginSpecification {
@@ -13,7 +12,7 @@ class NUnitPluginSpec extends PluginSpecification {
 
 	@Override
 	def setup() {
-		bundle.apply plugin: NUnitPlugin
+		bundle.apply plugin: kaizen.plugins.nunit.NUnitPlugin
 	}
 
 	def 'default nunit version is 2.6+'() {

plugins/core/src/test/groovy/kaizen/plugins/BasePluginInfo.groovy → plugins/testing/src/main/groovy/kaizen/testing/BasePluginInfo.groovy

@@ -1,4 +1,4 @@
-package kaizen.plugins
+package kaizen.testing
 
 import org.gradle.testfixtures.ProjectBuilder
 

plugins/core/src/test/groovy/kaizen/plugins/BundleSpecification.groovy → plugins/testing/src/main/groovy/kaizen/testing/BundleSpecification.groovy

@@ -1,6 +1,5 @@
-package kaizen.plugins
+package kaizen.testing
 
-import kaizen.testing.PluginSpecification
 import org.gradle.api.Project
 
 abstract class BundleSpecification extends PluginSpecification {

plugins/unity/build.gradle

@@ -0,0 +1,5 @@
+version = '0.1.0'
+
+dependencies {
+  compile project(':clr'), project(':lib-consumer')
+}

plugins/core/src/main/groovy/kaizen/plugins/InstallationPlugin.groovy → plugins/unity/src/main/groovy/kaizen/plugins/unity/InstallationPlugin.groovy

@@ -1,4 +1,4 @@
-package kaizen.plugins
+package kaizen.plugins.unity
 
 import org.gradle.api.Project
 import org.gradle.api.Plugin
@@ -15,7 +15,7 @@ class InstallationPlugin implements Plugin<Project> {
 
 		applyStartupFiles(project)
 
-		project.apply(plugin: LibClientPlugin)
+		project.apply(plugin: kaizen.plugins.LibClientPlugin)
 	}
 
 	// loads all files from kaizen.d

plugins/core/src/test/groovy/kaizen/plugins/InstallationPluginSpec.groovy → plugins/unity/src/test/groovy/kaizen/plugins/unity/InstallationPluginSpec.groovy

@@ -1,4 +1,4 @@
-package kaizen.plugins
+package kaizen.plugins.unity
 
 import kaizen.testing.DirectoryBuilder
 import kaizen.testing.PluginSpecification

plugins/core/src/test/groovy/kaizen/plugins/UnityPluginSpec.groovy → plugins/unity/src/test/groovy/kaizen/plugins/unity/UnityPluginSpec.groovy

@@ -1,6 +1,5 @@
-package kaizen.plugins
+package kaizen.plugins.unity
 
-import kaizen.plugins.unity.UnityPlugin
 import kaizen.testing.DirectoryBuilder
 import spock.lang.*
 import org.gradle.testfixtures.ProjectBuilder
@@ -19,7 +18,7 @@ class UnityPluginSpec extends Specification {
 		: /* linux */ 'Data/Mono/bin/cli')
 
 		def bundle = new ProjectBuilder().withProjectDir(projectDir).build()
-		bundle.apply plugin: UnityPlugin
+		bundle.apply plugin: 'unity'
 
 		when:
 		bundle.unity.unityDir = '../unity'
@@ -33,7 +32,7 @@ class UnityPluginSpec extends Specification {
 	def 'tool executable can be changed'() {
 		given:
 		def bundle = new ProjectBuilder().build()
-		bundle.apply plugin: UnityPlugin
+		bundle.apply plugin: 'unity'
 
 		def mono = bundle.unity.mono