correctly handle new api and implementation configurations

Author: dcendents

build.gradle

@@ -16,10 +16,10 @@ repositories {
 }
 
 ext {
-	androidGradleBuildVersion = '3.0.0-alpha1'
 	gradleVersions = '4.1'
+	androidGradleBuildVersion = '3.0.0-beta3'
 	androidCompileSdkVersion = 'android-26'
-	androidBuildToolsVersion = '26.0.0'
+	androidBuildToolsVersion = '26.0.1'
 }
 
 configurations {

src/main/java/org/gradle/api/plugins/AndroidMavenPlugin.java

@@ -195,8 +195,16 @@ private MavenPluginConvention addConventionObject(ProjectInternal project, Maven
     }
 
     private void configureAndroidScopeMappings(ConfigurationContainer configurations, Conf2ScopeMappingContainer mavenScopeMappings) {
+        mavenScopeMappings.addMapping(COMPILE_PRIORITY, configurations.getByName(JavaPlugin.API_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.COMPILE);
         mavenScopeMappings.addMapping(COMPILE_PRIORITY, configurations.getByName(JavaPlugin.COMPILE_CONFIGURATION_NAME),
                 Conf2ScopeMappingContainer.COMPILE);
+        mavenScopeMappings.addMapping(RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.RUNTIME);
+        mavenScopeMappings.addMapping(TEST_COMPILE_PRIORITY, configurations.getByName(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.TEST);
+        mavenScopeMappings.addMapping(TEST_RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.TEST);
     }
 
     private void configureJavaScopeMappings(ConfigurationContainer configurations, Conf2ScopeMappingContainer mavenScopeMappings) {

src/test/groovy/org/gradle/api/plugins/AndroidMavenPluginIT.groovy

@@ -86,6 +86,101 @@ class AndroidMavenPluginIT extends Specification {
 			group = 'org.test'
 			version = '1.0'
 			
+			repositories {
+				mavenCentral()
+			}
+
+			install {
+				repositories {
+					// Should be mavenInstaller but cannot find how to override the location
+					mavenDeployer {
+						repository(url: "${uri}/${gradleVersion}/repo")
+					}
+				}
+			}
+
+			android {
+				compileSdkVersion "${androidCompileSdkVersion}"
+				buildToolsVersion "${androidBuildToolsVersion}"
+			}
+			
+			dependencies {
+				compile 'commons-io:commons-io:2.2'
+				
+				testCompile	'junit:junit:4.12'
+			}
+
+			task runGradleTest {
+				dependsOn install
+			}
+        """
+		
+        when:
+        def result = GradleRunner.create()
+			.withGradleVersion(gradleVersion)
+            .withProjectDir(testProjectDir.root)
+            .withArguments('install')
+			.withPluginClasspath()
+            .build()
+
+        then:
+        result.task(":install").outcome == SUCCESS
+		File pom = validateRepo(gradleVersion);
+		validateDependencyScope(pom, 'commons-io', 'commons-io', '2.2', 'compile');
+		validateDependencyScope(pom, 'junit', 'junit', '4.12', 'test');
+		
+        where:
+        gradleVersion << gradleVersions
+    }
+
+	@Unroll
+    def "api and implementation is resolved with gradle #gradleVersion"() {
+        given:
+		androidManifest << """<?xml version="1.0" encoding="utf-8"?>
+			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.test.simple" android:versionCode="1" android:versionName="1.0" >
+				<application />
+			</manifest>
+		"""
+		
+		settingsFile << "rootProject.name = 'simple'"
+		
+		gradlePropertiesFile << "org.gradle.jvmargs=-javaagent:${jacocoRuntime}=destfile=${buildDir}/jacoco/testKit-${gradleVersion}.exec"
+		
+        def classpathString = pluginClasspath
+            .collect { it.absolutePath.replace('\\', '/') }
+            .collect { "'$it'" }
+            .join(", ")
+
+		def uri = testProjectDir.root.toURI()
+        buildFile << """
+			buildscript {
+				System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
+				
+				repositories {
+					jcenter()
+					mavenCentral()
+					mavenLocal()
+					maven {
+						url 'https://maven.google.com'
+					}
+				}
+
+				dependencies {
+					classpath "com.android.tools.build:gradle:${androidGradleBuildVersion}"
+					classpath files(${classpathString})
+				}
+			}
+			
+			apply plugin: 'com.android.library'
+			apply plugin: 'com.github.dcendents.android-maven'
+
+			group = 'org.test'
+			version = '1.0'
+			
+			repositories {
+				mavenCentral()
+			}
+
 			install {
 				repositories {
 					// Should be mavenInstaller but cannot find how to override the location
@@ -99,6 +194,13 @@ class AndroidMavenPluginIT extends Specification {
 				compileSdkVersion "${androidCompileSdkVersion}"
 				buildToolsVersion "${androidBuildToolsVersion}"
 			}
+			
+			dependencies {
+				api 'commons-io:commons-io:2.2'
+				implementation 'org.codehaus.groovy:groovy-all:2.4.11'
+				
+				testCompile	'junit:junit:4.12'
+			}
 
 			task runGradleTest {
 				dependsOn install
@@ -115,13 +217,16 @@ class AndroidMavenPluginIT extends Specification {
 
         then:
         result.task(":install").outcome == SUCCESS
-		validateRepo(gradleVersion);
+		File pom = validateRepo(gradleVersion);
+		validateDependencyScope(pom, 'commons-io', 'commons-io', '2.2', 'compile');
+		validateDependencyScope(pom, 'org.codehaus.groovy', 'groovy-all', '2.4.11', 'runtime');
+		validateDependencyScope(pom, 'junit', 'junit', '4.12', 'test');
 
         where:
         gradleVersion << gradleVersions
     }
 
-	private void validateRepo(String version) {
+	private File validateRepo(String version) {
 		File repo = new File(testProjectDir.root, version + "/repo/org/test/simple")
 		assert repo.exists()
 
@@ -145,5 +250,17 @@ class AndroidMavenPluginIT extends Specification {
 		assert pom.exists()
 		assert pomMd5.exists()
 		assert pomSha1.exists()
+		
+		//System.out.println(pom.text);
+		return pom;
+	}
+	
+	private void validateDependencyScope(File pom, String groupId, String artifactId, String version, String scope) {
+		def project = new XmlSlurper().parse(pom);
+		def dependencies = project.dependencies;
+		def dependency = dependencies.'*'.find { node->
+			node.groupId = groupId && node.artifactId == artifactId && node.version == version
+		}
+		assert dependency.scope == scope;
 	}
 }