Merge pull request #4 from AdamKobus/ST-134-2

ST-134 Fabric is now properly configured for custom build types

README.md

@@ -117,7 +117,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.infullmobile:toolkit:0.3.10'
+        classpath 'com.infullmobile:toolkit:0.3.12'
     }
 }
 ```

src/main/groovy/com/infullmobile/toolkit/impl/android/commands/ConfigureCoverageCommand.groovy

@@ -18,7 +18,7 @@ class ConfigureCoverageCommand extends IConfigCommand {
 
     @Override
     void performCommand(IProjectConfigurator configurator) {
-        configuredProject.android.buildTypes.each() { buildType ->
+        configuredProject.android.buildTypes.all() { buildType ->
             buildType.testCoverageEnabled = true
         }
         if(!PluginsUtils.hasJacocoPlugin(configuredProject)) {

src/main/groovy/com/infullmobile/toolkit/impl/android/commands/ConfigureFabricCommand.groovy

@@ -21,8 +21,8 @@ class ConfigureFabricCommand extends IConfigCommand {
         if (!PluginsUtils.hasFabricPlugin(configuredProject)) {
             return;
         }
-        configuredProject.android.buildTypes.each { buildType ->
-            def team = getChosenFabricTeam();
+        configuredProject.android.buildTypes.all { buildType ->
+            def String team = getChosenFabricTeam();
             if (team) {
                 buildType.ext.betaDistributionGroupAliases = team
             }
@@ -34,14 +34,10 @@ class ConfigureFabricCommand extends IConfigCommand {
     }
 
     def getChosenFabricTeam() {
-        def team = configuredProject.hasProperty('fabricTeam') ? configuredProject.fabricTeam : config.defaultFabricTeam
-        println ">> Fabric team is set to $team on project ${configuredProject.name}"
-        return team
+        return configuredProject.hasProperty('fabricTeam') ? configuredProject.fabricTeam : config.defaultFabricTeam
     }
 
     def getChangelogPath() {
-        def path = configuredProject.hasProperty('fabricChangelogPath') ? configuredProject.fabricChangelogPath : null
-        println ">> Changelog path is set to $path in project ${configuredProject.name}"
-        return path
+        return configuredProject.hasProperty('fabricChangelogPath') ? configuredProject.fabricChangelogPath : null
     }
 }