Merge pull request #796 from Bilue404/fix_build_err

Yves0 · web-flow · commit ae4559986fd4 · 2023-03-02T15:01:29.000+08:00
fix matrix-android build err on AGP 7.x.x
diff --git a/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/transform/MatrixTraceTransform.kt b/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/transform/MatrixTraceTransform.kt
@@ -151,7 +151,7 @@ class MatrixTraceTransform(
     }
 
     private fun toOutputFile(outputDir: File, inputDir: File, inputFile: File): File {
-        return File(outputDir, FileUtils.relativePossiblyNonExistingPath(inputFile, inputDir))
+        return File(outputDir, inputFile.toRelativeString(inputDir))
     }
 
     private fun configure(transformInvocation: TransformInvocation): Configuration {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ class MatrixTraceTransform(`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`private fun toOutputFile(outputDir: File, inputDir: File, inputFile: File): File {`
`154`		`- return File(outputDir, FileUtils.relativePossiblyNonExistingPath(inputFile, inputDir))`
	`154`	`+ return File(outputDir, inputFile.toRelativeString(inputDir))`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`private fun configure(transformInvocation: TransformInvocation): Configuration {`