From be9610eea4afc9bf651cf6d19221adec508eb267 Mon Sep 17 00:00:00 2001 From: arunkumar9t2 Date: Wed, 8 May 2024 01:21:34 +0800 Subject: [PATCH] Handle relative paths sometimes returned by gradle in lint.xml --- WORKSPACE | 2 +- constants.gradle | 2 +- .../kotlin/com/grab/grazel/bazel/starlark/BazelDependency.kt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index acfc6c9a..33d1929f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -368,7 +368,6 @@ maven_install( "android.arch.lifecycle:livedata-core", "android.arch.lifecycle:runtime", "android.arch.lifecycle:viewmodel", - "androidx.fragment:fragment", "com.android.databinding:baseLibrary", "com.android.support:animated-vector-drawable", "com.android.support:cardview-v7", @@ -382,6 +381,7 @@ maven_install( "com.android.support:support-compat", "com.android.support:support-core-ui", "com.android.support:support-core-utils", + "com.android.support:support-fragment", "com.android.support:support-vector-drawable", "com.android.support:versionedparcelable", "com.android.support:viewpager", diff --git a/constants.gradle b/constants.gradle index 941e882e..a68eed67 100644 --- a/constants.gradle +++ b/constants.gradle @@ -15,7 +15,7 @@ */ ext { groupId = "com.grab.grazel" - versionName = project.hasProperty("versionName") ? versionName : "0.4.1-alpha.28" + versionName = project.hasProperty("versionName") ? versionName : "0.4.1-alpha.29" website = "https://grab.github.io/Grazel/" } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/starlark/BazelDependency.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/starlark/BazelDependency.kt index e00d05b6..869be3dc 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/starlark/BazelDependency.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/starlark/BazelDependency.kt @@ -57,7 +57,9 @@ sealed class BazelDependency : Comparable { ) : BazelDependency() { override fun toString(): String { val fileName = file.name - val filePath = rootProject.relativePath(file) + val filePath = file.absoluteFile + .normalize() + .relativeTo(rootProject.projectDir).toString() return if (fileName == filePath) { "//:$fileName" } else {