Unverified Commit 4954bbfa authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Read properties files as UTF-8 in Gradle scripts (#13981)

Fixes https://github.com/flutter/flutter/issues/13972
parent 1954ffca
...@@ -46,7 +46,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -46,7 +46,7 @@ class FlutterPlugin implements Plugin<Project> {
private Properties readPropertiesIfExist(File propertiesFile) { private Properties readPropertiesIfExist(File propertiesFile) {
Properties result = new Properties() Properties result = new Properties()
if (propertiesFile.exists()) { if (propertiesFile.exists()) {
propertiesFile.withInputStream { stream -> result.load(stream) } propertiesFile.withReader('UTF-8') { reader -> result.load(reader) }
} }
return result return result
} }
......
def localProperties = new Properties() def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties') def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) { if (localPropertiesFile.exists()) {
localPropertiesFile.withInputStream { stream -> localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(stream) localProperties.load(reader)
} }
} }
......
def localProperties = new Properties() def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties') def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) { if (localPropertiesFile.exists()) {
localPropertiesFile.withInputStream { stream -> localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(stream) localProperties.load(reader)
} }
} }
......
...@@ -5,7 +5,7 @@ def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() ...@@ -5,7 +5,7 @@ def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
def plugins = new Properties() def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) { if (pluginsFile.exists()) {
pluginsFile.withInputStream { stream -> plugins.load(stream) } pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
} }
plugins.each { name, path -> plugins.each { name, path ->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment