Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
4954bbfa
Unverified
Commit
4954bbfa
authored
Jan 08, 2018
by
Jason Simmons
Committed by
GitHub
Jan 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Read properties files as UTF-8 in Gradle scripts (#13981)
Fixes
https://github.com/flutter/flutter/issues/13972
parent
1954ffca
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+1
-1
build.gradle.tmpl
.../templates/create/android-java.tmpl/app/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...emplates/create/android-kotlin.tmpl/app/build.gradle.tmpl
+2
-2
settings.gradle
...utter_tools/templates/create/android.tmpl/settings.gradle
+1
-1
No files found.
packages/flutter_tools/gradle/flutter.gradle
View file @
4954bbfa
...
...
@@ -46,7 +46,7 @@ class FlutterPlugin implements Plugin<Project> {
private
Properties
readPropertiesIfExist
(
File
propertiesFile
)
{
Properties
result
=
new
Properties
()
if
(
propertiesFile
.
exists
())
{
propertiesFile
.
with
InputStream
{
stream
->
result
.
load
(
stream
)
}
propertiesFile
.
with
Reader
(
'UTF-8'
)
{
reader
->
result
.
load
(
reader
)
}
}
return
result
}
...
...
packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl
View file @
4954bbfa
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.with
InputStream { stream
->
localProperties.load(
stream
)
localPropertiesFile.with
Reader('UTF-8') { reader
->
localProperties.load(
reader
)
}
}
...
...
packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl
View file @
4954bbfa
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.with
InputStream { stream
->
localProperties.load(
stream
)
localPropertiesFile.with
Reader('UTF-8') { reader
->
localProperties.load(
reader
)
}
}
...
...
packages/flutter_tools/templates/create/android.tmpl/settings.gradle
View file @
4954bbfa
...
...
@@ -5,7 +5,7 @@ def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
def
plugins
=
new
Properties
()
def
pluginsFile
=
new
File
(
flutterProjectRoot
.
toFile
(),
'.flutter-plugins'
)
if
(
pluginsFile
.
exists
())
{
pluginsFile
.
with
InputStream
{
stream
->
plugins
.
load
(
stream
)
}
pluginsFile
.
with
Reader
(
'UTF-8'
)
{
reader
->
plugins
.
load
(
reader
)
}
}
plugins
.
each
{
name
,
path
->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment