File tree Expand file tree Collapse file tree
Android/DevSample/buildSrc/src/main/groovy/net/wequick/gradle Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -170,9 +170,11 @@ class RootPlugin extends BasePlugin {
170170 def cfg = p. configurations. compile
171171 def supportDependencies = []
172172 cfg. dependencies. each { d ->
173- if (d. group == ' com.android.support' && d. version != sv) {
174- supportDependencies. add(d)
175- }
173+ if (d. group != ' com.android.support' ) return
174+ if (d. name == ' multidex' ) return
175+ if (d. version == sv) return
176+
177+ supportDependencies. add(d)
176178 }
177179 cfg. dependencies. removeAll(supportDependencies)
178180 supportDependencies. each { d ->
@@ -338,7 +340,7 @@ class RootPlugin extends BasePlugin {
338340 }
339341 def cfg = p. configurations. compile
340342 def supportLib = cfg. dependencies. find { d ->
341- d. group == ' com.android.support'
343+ d. group == ' com.android.support' && d . name != ' multidex '
342344 }
343345 def supportVer = supportLib != null ? supportLib. version : ' '
344346 return [sdk : sdk,
You can’t perform that action at this time.
0 commit comments