Update plugin.gradle

Author: limpoxe

FairyPlugin/agp7_2_0/plugin.gradle

@@ -1,3 +1,4 @@
+import org.gradle.api.internal.artifacts.DefaultProjectComponentIdentifier
 import org.xml.sax.InputSource
 import org.xml.sax.SAXException
 import org.xml.sax.helpers.DefaultHandler
@@ -22,13 +23,23 @@ configurations {
 class FaiyExt {
  private boolean requireHostVersion = true;
 
+ private String hostDependenciesToExclude;
+
  public boolean getRequireHostVersion() {
  return requireHostVersion
  }
 
  public void setRequireHostVersion(boolean required) {
  this.requireHostVersion = required
  }
+
+ public String getHostDependenciesToExclude() {
+ return this.hostDependenciesToExclude;
+ }
+
+ public void setHostDependenciesToExclude(String hostDependenciesToExclude) {
+ this.hostDependenciesToExclude = hostDependenciesToExclude;
+ }
 }
 extensions.create('fairy', FaiyExt)
 
@@ -42,24 +53,39 @@ def hostBarRootDir = rootProject.rootDir.absolutePath + '/.gradle/fairy/baseline
 def defaultExtraDir = hostBarRootDir + "unspecified"
 def hostDependencies = defaultExtraDir + "/" + hostDependencyFile
 def currentSelectedBar = defaultExtraDir + "/" + hostBar
+def boolean startParameterWithhDebugOrRelease = false;
 gradle.startParameter.taskNames.each { startTaskName ->
  if (startTaskName.contains("Debug")) {
  hostDependencies = hostBarRootDir + "debug" + "/" + hostDependencyFile
  currentSelectedBar = hostBarRootDir + "debug" + "/" + hostBar
+ startParameterWithhDebugOrRelease = true;
  } else if (startTaskName.contains("Release")) {
  hostDependencies = hostBarRootDir + "release" + "/" + hostDependencyFile
  currentSelectedBar = hostBarRootDir + "release" + "/" + hostBar
+ startParameterWithhDebugOrRelease = true;
  }
 }
 
 println "执行命令决定了bar文件依赖路径！"
 println ">>>" + hostBarRootDir
 println ">>>" + currentSelectedBar
-println ">>>" + hostDependencies
 
-if (file(hostDependencies).exists()) {
- println ">>>apply from: " + hostDependencies
- apply from: hostDependencies
+if (fairy.hostDependenciesToExclude != null && file(fairy.hostDependenciesToExclude).exists()) {
+ println ">>>apply from: " + fairy.hostDependenciesToExclude
+ apply from: fairy.hostDependenciesToExclude
+} else {
+ if (file(hostDependencies).exists()) {
+ println ">>>apply from: " + hostDependencies
+ apply from: hostDependencies
+ } else {
+ if (startParameterWithhDebugOrRelease) {
+ throw new Exception("由于gradle脚本的执行顺序问题，宿主基线包可能还没编译、${hostDependencies}文件可能还没有从插件依赖的基线包中解压出来\n" +
+ "此时需要自行手动下载hostBar并从中解压出host_dependencies.gradle, 再将此文件路径配置到插件工程的build.gradle内:\n" +
+ "fairy {\n" +
+ " hostDependenciesToExclude = \"<path/to/host_dependencies.gradle>\"\n" +
+ "}\n")
+ }
+ }
 }
 
 android.androidResources.additionalParameters(
@@ -179,6 +205,7 @@ afterEvaluate {
  it.doLast {
  if (rtConfig.isCanBeResolved() && rtConfig.getResolutionAlternatives() == null) {
  TreeSet hashSet = new TreeSet()
+ //rtConfig.getIncoming().beforeResolve(new Action<ResolvableDependencies>() {})
  rtConfig.getIncoming().getResolutionResult().getRoot().getDependencies().each() { dependencyResult->
  if (dependencyResult instanceof ResolvedDependencyResult) {
  add(hashSet, dependencyResult)
@@ -190,13 +217,11 @@ afterEvaluate {
  dependenciesTxt.append("// variant is ${varName}\n")
  String hostTxt = new File(hostDependencies).text
  hashSet.each { moduleFullName->
- if (!moduleFullName.startsWith("project ")) {//源码依赖的不处理
- if (hostTxt.contains(moduleFullName)) {
- dependenciesTxt.append("// NOTICE: This module is both in host and plugin apk file!\n")
- }
- dependenciesTxt.append(moduleFullName)
- dependenciesTxt.append("\n")
+ if (hostTxt.contains(moduleFullName)) {
+ dependenciesTxt.append("// NOTICE: This module is both in host and plugin apk file!\n")
  }
+ dependenciesTxt.append(moduleFullName)
+ dependenciesTxt.append("\n")
  }
  dependenciesTxt.append("\n")
  }
@@ -296,7 +321,9 @@ afterEvaluate {
 }
 
 def add(Set set, ResolvedDependencyResult dependencyResult) {
- set.add(dependencyResult.getSelected().getId().displayName)
+ if (!(dependencyResult.getSelected().getId() instanceof DefaultProjectComponentIdentifier)) {//源码依赖的不处理
+ set.add(dependencyResult.getSelected().getId().displayName)
+ }
  dependencyResult.getSelected().getDependencies().each() { childDependencyResult->
  if (childDependencyResult instanceof ResolvedDependencyResult) {
  add(set, childDependencyResult)