Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
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
community
godot
Commits
7dea2ad1
Commit
7dea2ad1
authored
Mar 06, 2020
by
fhuya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Trim the whitespace around the plugins names.
parent
d4b31c69
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
config.gradle
platform/android/java/app/config.gradle
+1
-1
GodotPluginRegistry.java
...src/org/godotengine/godot/plugin/GodotPluginRegistry.java
+5
-2
No files found.
platform/android/java/app/config.gradle
View file @
7dea2ad1
...
@@ -42,7 +42,7 @@ ext.getGodotPluginsBinaries = { ->
...
@@ -42,7 +42,7 @@ ext.getGodotPluginsBinaries = { ->
String
pluginsList
=
project
.
property
(
"custom_template_plugins"
)
String
pluginsList
=
project
.
property
(
"custom_template_plugins"
)
if
(
pluginsList
!=
null
&&
!
pluginsList
.
trim
().
isEmpty
())
{
if
(
pluginsList
!=
null
&&
!
pluginsList
.
trim
().
isEmpty
())
{
for
(
String
plugin
:
pluginsList
.
split
(
","
))
{
for
(
String
plugin
:
pluginsList
.
split
(
","
))
{
binDeps
+=
plugin
+
"*.aar"
binDeps
+=
plugin
.
trim
()
+
"*.aar"
}
}
}
}
}
}
...
...
platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
View file @
7dea2ad1
...
@@ -139,7 +139,10 @@ public final class GodotPluginRegistry {
...
@@ -139,7 +139,10 @@ public final class GodotPluginRegistry {
return
;
return
;
}
}
enabledPluginsSet
=
new
HashSet
<>(
Arrays
.
asList
(
enabledPluginsList
));
enabledPluginsSet
=
new
HashSet
<>();
for
(
String
enabledPlugin
:
enabledPluginsList
)
{
enabledPluginsSet
.
add
(
enabledPlugin
.
trim
());
}
}
else
{
}
else
{
enabledPluginsSet
=
null
;
enabledPluginsSet
=
null
;
}
}
...
@@ -148,7 +151,7 @@ public final class GodotPluginRegistry {
...
@@ -148,7 +151,7 @@ public final class GodotPluginRegistry {
for
(
String
metaDataName
:
metaData
.
keySet
())
{
for
(
String
metaDataName
:
metaData
.
keySet
())
{
// Parse the meta-data looking for entry with the Godot plugin name prefix.
// Parse the meta-data looking for entry with the Godot plugin name prefix.
if
(
metaDataName
.
startsWith
(
GODOT_PLUGIN_V1_NAME_PREFIX
))
{
if
(
metaDataName
.
startsWith
(
GODOT_PLUGIN_V1_NAME_PREFIX
))
{
String
pluginName
=
metaDataName
.
substring
(
godotPluginV1NamePrefixLength
);
String
pluginName
=
metaDataName
.
substring
(
godotPluginV1NamePrefixLength
)
.
trim
()
;
if
(
enabledPluginsSet
!=
null
&&
!
enabledPluginsSet
.
contains
(
pluginName
))
{
if
(
enabledPluginsSet
!=
null
&&
!
enabledPluginsSet
.
contains
(
pluginName
))
{
Log
.
w
(
TAG
,
"Plugin "
+
pluginName
+
" is listed in the dependencies but is not enabled."
);
Log
.
w
(
TAG
,
"Plugin "
+
pluginName
+
" is listed in the dependencies but is not enabled."
);
continue
;
continue
;
...
...
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