From 42dc39fb952d65dbcaf610794bf0e41d54e510c4 Mon Sep 17 00:00:00 2001 From: Jacob Mattsson Date: Tue, 24 May 2016 09:24:47 +0200 Subject: [PATCH 1/2] Fixed issues #417 and #573, where resource overlays dirs were not properly configured --- .../android/phase01generatesources/GenerateSourcesMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java b/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java index e4c723063..d14b86075 100644 --- a/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java +++ b/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java @@ -867,8 +867,8 @@ private void generateR() throws MojoExecutionException .disablePngCrunching() .generateRIntoPackage( customPackage ) .setPathToAndroidManifest( destinationManifestFile ) - .addResourceDirectoryIfExists( resourceDirectory ) - .addResourceDirectoriesIfExists( getResourceOverlayDirectories() ) + .addResourceDirectoriesIfExists( getResourceOverlayDirectories() ) + .addResourceDirectoryIfExists( resourceDirectory ) // Need to include any AAR or APKLIB dependencies when generating R because if any local // resources directly reference dependent resources then R generation will crash. .addResourceDirectoriesIfExists( getLibraryResourceFolders() ) From 0a6a661b0616bb2dc1283662f338b8241cdc001f Mon Sep 17 00:00:00 2001 From: Jacob Mattsson Date: Tue, 24 May 2016 09:24:47 +0200 Subject: [PATCH 2/2] Fixed issues #417 and #573, where resource overlays dirs were not properly configured --- .../android/phase01generatesources/GenerateSourcesMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java b/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java index e4c723063..c584b50e7 100644 --- a/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java +++ b/src/main/java/com/simpligility/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java @@ -867,8 +867,8 @@ private void generateR() throws MojoExecutionException .disablePngCrunching() .generateRIntoPackage( customPackage ) .setPathToAndroidManifest( destinationManifestFile ) - .addResourceDirectoryIfExists( resourceDirectory ) .addResourceDirectoriesIfExists( getResourceOverlayDirectories() ) + .addResourceDirectoryIfExists( resourceDirectory ) // Need to include any AAR or APKLIB dependencies when generating R because if any local // resources directly reference dependent resources then R generation will crash. .addResourceDirectoriesIfExists( getLibraryResourceFolders() )