Merge pull request #125 from gradle/no/4.1

Add support for AGP 4.1

Author: ghale

build.gradle

@@ -12,8 +12,8 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
 
 // Maps supported Android plugin versions to the versions of Gradle that support it
 def supportedVersions = [
-    "4.2.0-alpha13": ["6.6.1"],
-    "4.1.0-rc03": ["6.5.1"],
+    "4.2.0-alpha13": ["6.7"],
+    "4.1.0": ["6.5.1"],
     "4.0.2": ["6.1.1", "6.3", "6.4.1"],
     "3.6.4": ["5.6.4", "6.3", "6.4.1"],
     "3.5.4": ["5.4.1", "5.6.4", "6.3", "6.4.1"]

src/test/groovy/org/gradle/android/WorkaroundTest.groovy

@@ -13,7 +13,7 @@ class WorkaroundTest extends Specification {
         where:
         androidVersion  | expectedWorkarounds
         "4.2.0-alpha13" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
-        "4.1.0-rc03"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
+        "4.1.0"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
         "4.0.2"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
         "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']
         "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'DexFileDependencies']