diff options
| author | George Mount <mount@google.com> | 2015-10-05 16:46:01 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2015-10-05 17:12:48 -0700 |
| commit | f1081f6a15e6b905701bd3bbcb5d598731d05afb (patch) | |
| tree | b7eb0c44ec8f66771ba7f54641699977147a27c2 /developmentPlugins | |
| parent | eae7e68312d9db4c886057f631b26a37104e5e67 (diff) | |
| download | data-binding-f1081f6a15e6b905701bd3bbcb5d598731d05afb.tar.gz | |
Fix error processing XML when german character is used.
Bug 24507894
The character set was not being properly detected for the XML
file when it was being loaded, so it was always using the default
character set. For Windows, this turned out to be something other
than UTF-8. Now, a library is used to detect the character set
before parsing.
Change-Id: I2ea041701de59f0e72fd18288b0f62cb2beb74e6
Diffstat (limited to 'developmentPlugins')
| -rw-r--r-- | developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/ExportLicensesTask.groovy | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/ExportLicensesTask.groovy b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/ExportLicensesTask.groovy index 09a27c3d..d5f7a6c5 100644 --- a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/ExportLicensesTask.groovy +++ b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/ExportLicensesTask.groovy @@ -98,8 +98,11 @@ class ExportLicensesTask extends DefaultTask { [ libraries: ["logkit"], licenseText: ["unknown. see: http://commons.apache.org/proper/commons-logging/dependencies.html"] - ] - + ], + [ + libraries: ["juniversalchardet"], + licenses: ["https://mozorg.cdn.mozilla.net/media/MPL/2.0/index.815ca599c9df.txt"] + ], ] Map<String, Object> usedLicenses = new HashMap<>(); |