feat: 支持消费Shadow时使用Gradle 7.2与AGP 7.1.1

Tencent#799
shifujun · Feb 11, 2022 · 2c5f4eb · 2c5f4eb
1 parent c9aa4b6
commit 2c5f4eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...ore/transform-kit/src/main/kotlin/com/tencent/shadow/core/transform_kit/ClassTransform.kt b/...ore/transform-kit/src/main/kotlin/com/tencent/shadow/core/transform_kit/ClassTransform.kt
@@ -47,7 +47,7 @@ abstract class ClassTransform(val project: Project) : Transform() {
      * 获取输入文件对应的输出文件路径.即将文件this路径中的inputDir部分替换为outputDir.
      */
     fun File.toOutputFile(inputDir: File, outputDir: File): File {
-        return File(outputDir, FileUtils.relativePossiblyNonExistingPath(this, inputDir))
+        return File(outputDir, this.toRelativeString(inputDir))
     }
 
     fun input(inputs: Collection<com.android.build.api.transform.TransformInput>,

diff --git a/projects/test/gradle-plugin-agp-compat-test/test.sh b/projects/test/gradle-plugin-agp-compat-test/test.sh
@@ -29,6 +29,8 @@ function testUnderAGPVersion() {
 
 # 测试版本来源
 # https://developer.android.com/studio/releases/gradle-plugin
+setGradleVersion 7.2
+testUnderAGPVersion 7.1.1
 setGradleVersion 7.0.2
 testUnderAGPVersion 7.0.0
 testUnderAGPVersion 4.2.0