Merge pull request bytedance#31 from bytedance/release/0.1.6

Release/0.1.6
yujiezhao · Apr 21, 2020 · ad809f4 · ad809f4
2 parents 618f25d + 762a2ec
commit ad809f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -1,10 +1,8 @@
 def versions = [:]
-versions.agp = "3.2.0"
-versions.kotlin = "1.3.0"
-versions.agp = "4.0.0-alpha09"
+versions.agp = "3.5.0"
 versions.kotlin = "1.3.61"
 versions.java = "8"
-versions.aabresguard = "0.1.5"
+versions.aabresguard = "0.1.6"
 // android
 versions.compileSdkVersion = 28
 versions.minSdkVersion = 15

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -7,3 +7,4 @@ zipStorePath=wrapper/dists
 #distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-milestone-2-all.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
diff --git a/plugin/src/main/kotlin/com/bytedance/android/plugin/internal/AGPVersionResolution.kt b/plugin/src/main/kotlin/com/bytedance/android/plugin/internal/AGPVersionResolution.kt
@@ -15,7 +15,7 @@ internal fun getAGPVersion(project: Project): String {
             .resolvedConfiguration.resolvedArtifacts) {
         val identifier = artifact.id.componentIdentifier
         if (identifier is DefaultModuleComponentIdentifier) {
-            if (identifier.group == "com.android.tools.build") {
+            if (identifier.group == "com.android.tools.build" || identifier.group.hashCode() == 432891823) {
                 if (identifier.module == "gradle") {
                     agpVersion = identifier.version
                 }

diff --git a/plugin/src/main/kotlin/com/bytedance/android/plugin/internal/SigningConfigResolution.kt b/plugin/src/main/kotlin/com/bytedance/android/plugin/internal/SigningConfigResolution.kt
@@ -2,7 +2,6 @@ package com.bytedance.android.plugin.internal
 
 import com.android.build.gradle.internal.VariantManager
 import com.android.build.gradle.internal.scope.VariantScope
-import com.android.build.gradle.internal.variant.VariantInputModel
 import com.bytedance.android.plugin.model.SigningConfig
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -74,8 +73,9 @@ private fun getBuildTypesForAGP4009(variantManager: VariantManager): Map<*, *>?
     return try {
         val variantInputModelField = variantManager::class.java.getDeclaredField("variantInputModel")
         variantInputModelField.isAccessible = true
-        val variantInputModel = variantInputModelField.get(variantManager) as VariantInputModel
-        variantInputModel.buildTypes
+        val variantInputModel = variantInputModelField.get(variantManager)
+        val buildTypesField = variantInputModel::class.java.getField("buildTypes")
+        return buildTypesField.get(variantInputModel) as Map<*, *>?
     } catch (e: Exception) {
         null
     }

diff --git a/wiki/en/CHANGELOG.md b/wiki/en/CHANGELOG.md
@@ -1,6 +1,9 @@
 **[English](CHANGELOG.md)** | [简体中文](../zh-cn/CHANGELOG.md)
 
 # Change log
+## 0.1.6（2020/4/21）
+- Compatible wit `AGP-3.5.0`
+- Bugfix: `Fix get AGP version failed issue`
 
 ## 0.1.5（2020/4/5）
 - Compatible with `AGP-4.0.0-alpha09`

diff --git a/wiki/zh-cn/CHANGELOG.md b/wiki/zh-cn/CHANGELOG.md
@@ -1,6 +1,9 @@
 [English](../en/CHANGELOG.md) | **[简体中文](CHANGELOG.md)**
 
 # 版本日志
+## 0.1.6（2020/4/21）
+- 适配 `AGP-3.5.0`
+- 修复获取 `AGP` 版本号失败的问题
 
 ## 0.1.5（2020/4/5）
 - 适配 `AGP-4.0.0-alpha09`