Skip to content

Commit 2f4c694

Browse files
j-roskopfj-roskopf
authored
Merge pull request #2 from j-roskopf/jr/relative
write relative file path to baseline
2 parents 2411819 + c7f7bce commit 2f4c694

File tree

7 files changed

+65
-12
lines changed

7 files changed

+65
-12
lines changed

‎kotlin-warning-baseline-generator/gradle-plugin/src/functionalTest/kotlin/com/joetr/kotlin/warning/baseline/generator/task/WriteKotlinWarningBaselineTaskTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ package com.joetr.kotlin.warning.baseline.generator.task
2525

2626
import assertk.assertThat
2727
import assertk.assertions.contains
28+
import assertk.assertions.doesNotContain
2829
import assertk.assertions.exists
2930
import com.joetr.kotlin.warning.baseline.generator.BasicAndroidProject
3031
import com.joetr.kotlin.warning.baseline.generator.infra.RetryRule
@@ -55,6 +56,9 @@ class WriteKotlinWarningBaselineTaskTest {
5556
assertThat(baselineFile.toFile()).exists()
5657
assertThat(baselineFile.readText())
5758
.contains("TestComposable.kt:6:20 Condition 'test != null' is always 'true")
59+
60+
// only relative paths
61+
assertThat(baselineFile.readText()).doesNotContain("w: file:///")
5862
}
5963

6064
@Test

‎kotlin-warning-baseline-generator/gradle-plugin/src/main/kotlin/com/joetr/kotlin/warning/baseline/generator/ConfigureKotlinWarningBaseline.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ internal fun Project.configureKotlinWarningBaselineForAndroid(eventListenerRegis
7979

8080
val extension = KotlinWarningBaselineExtension.get(this)
8181

82-
val warningFileCollector = WarningFileCollector().apply {
82+
val warningFileCollector = WarningFileCollector(
83+
project.layout.projectDirectory.asFile,
84+
).apply {
8385
projectName = project.name
8486
}
8587

@@ -137,7 +139,9 @@ internal fun Project.configureKotlinWarningBaselineForMultiplatform(eventListene
137139
},
138140
)
139141

140-
val warningFileCollector = WarningFileCollector().apply {
142+
val warningFileCollector = WarningFileCollector(
143+
project.layout.projectDirectory.asFile,
144+
).apply {
141145
projectName = project.name
142146
}
143147

‎kotlin-warning-baseline-generator/gradle-plugin/src/main/kotlin/com/joetr/kotlin/warning/baseline/generator/collector/WarningFileCollector.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,17 @@ import org.gradle.internal.operations.logging.LogEventBuildOperationProgressDeta
3434
import java.io.File
3535
import java.util.concurrent.ConcurrentHashMap
3636

37-
internal class WarningFileCollector {
37+
internal class WarningFileCollector(
38+
projectPath: File,
39+
) {
3840
internal val kotlinWarningsMap = ConcurrentHashMap<String, Set<String>>()
3941

4042
lateinit var projectName: String
4143

4244
var fileToWriteTo: File? = null
4345

46+
private val prefixToFilter = "w: file://${projectPath}${File.separatorChar}"
47+
4448
internal val buildOperationListener =
4549
object : BuildOperationListener {
4650

@@ -56,10 +60,10 @@ internal class WarningFileCollector {
5660
val log = progressEvent.details
5761
if (log is LogEventBuildOperationProgressDetails) {
5862
if (log.level.name == LogLevel.WARN.name) {
59-
if (log.message.contains("w:") && log.message.contains(".kt")) {
63+
if (log.message.startsWith(prefixToFilter) && log.message.contains(".kt")) {
6064
if (log.message.contains("/$projectName/")) {
6165
kotlinWarningsMap[projectName] =
62-
kotlinWarningsMap.getOrDefault(projectName, emptySet()) + setOf(log.message)
66+
kotlinWarningsMap.getOrDefault(projectName, emptySet()) + setOf("...${File.separatorChar}".plus(log.message.removePrefix(prefixToFilter)))
6367
}
6468
}
6569
}

‎kotlin-warning-baseline-generator/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kotlin.code.style=official
22

33
GROUP=com.joetr.kotlin.warning.baseline.generator
4-
VERSION_NAME=1.0.1
4+
VERSION_NAME=1.0.2
55
YEAR=2024
66
DISPLAY_NAME=Kotlin Warning Baseline Generator
77
DESCRIPTION=A Gradle plugin for creating baselines from Kotlin warnings

‎sandbox-android-app/app/warning-baseline-release-android.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was automatically generated by the Kotlin Warning Baseline Generator Plugin
22
# and should not be edited manually.
33

4-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-android-app/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt:10:12 Condition is always 'true'.
5-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-android-app/app/src/main/java/com/example/myapplication/MainActivity.kt:25:12 Condition is always 'true'.
6-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-android-app/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt:16:12 Condition is always 'true'.
4+
ExampleInstrumentedTest.kt:10:12 Condition is always 'true'.
5+
ExampleUnitTest.kt:16:12 Condition is always 'true'.
6+
MainActivity.kt:25:12 Condition is always 'true'.

‎sandbox-multiplatform-app/androidApp/warning-baseline-release-android.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was automatically generated by the Kotlin Warning Baseline Generator Plugin
22
# and should not be edited manually.
33

4-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-multiplatform-app/androidApp/src/androidMain/kotlin/example/imageviewer/MainActivity.kt:25:20 Parameter 'test' is never used
5-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-multiplatform-app/androidApp/src/test/java/com/example/myapplication/ExampleUnitTest.kt:18:12 Condition 'testSrcSet != null' is always 'true'
6-
w: file:///Users/joeroskopf/Code/KotlinWarningBaselineGeneratorGithub/KotlinWarningBaselineGenerator/sandbox-multiplatform-app/androidApp/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt:10:12 Condition 'androidTest != null' is always 'true'
4+
.../src/androidMain/kotlin/example/imageviewer/MainActivity.kt:23:20 Parameter 'test' is never used
5+
.../src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt:10:12 Condition 'androidTest != null' is always 'true'
6+
.../src/test/java/com/example/myapplication/ExampleUnitTest.kt:18:12 Condition 'testSrcSet != null' is always 'true'

‎sandbox-multiplatform-app/shared/warning-baseline-release-android.txt‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This file was automatically generated by the Kotlin Warning Baseline Generator Plugin
2+
# and should not be edited manually.
3+
4+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:10:29 'Allocation' is deprecated. Deprecated in Java
5+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:11:29 'Element' is deprecated. Deprecated in Java
6+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:12:29 'RenderScript' is deprecated. Deprecated in Java
7+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:13:29 'ScriptIntrinsicBlur' is deprecated. Deprecated in Java
8+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:67:23 'RenderScript' is deprecated. Deprecated in Java
9+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:67:38 'RenderScript' is deprecated. Deprecated in Java
10+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:67:51 'create(Context!): RenderScript!' is deprecated. Deprecated in Java
11+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:69:16 'Allocation' is deprecated. Deprecated in Java
12+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:69:29 'Allocation' is deprecated. Deprecated in Java
13+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:69:40 'createFromBitmap(RenderScript!, Bitmap!): Allocation!' is deprecated. Deprecated in Java
14+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:70:17 'Allocation' is deprecated. Deprecated in Java
15+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:70:30 'Allocation' is deprecated. Deprecated in Java
16+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:70:41 'createFromBitmap(RenderScript!, Bitmap!): Allocation!' is deprecated. Deprecated in Java
17+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:72:23 'ScriptIntrinsicBlur' is deprecated. Deprecated in Java
18+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:73:29 'create(RenderScript!, Element!): ScriptIntrinsicBlur!' is deprecated. Deprecated in Java
19+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:73:50 'Element' is deprecated. Deprecated in Java
20+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:73:58 'U8_4(RenderScript!): Element!' is deprecated. Deprecated in Java
21+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:73:9 'ScriptIntrinsicBlur' is deprecated. Deprecated in Java
22+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:75:18 'setRadius(Float): Unit' is deprecated. Deprecated in Java
23+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:76:18 'setInput(Allocation!): Unit' is deprecated. Deprecated in Java
24+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:77:18 'forEach(Allocation!): Unit' is deprecated. Deprecated in Java
25+
.../src/androidMain/kotlin/example/imageviewer/utils/GraphicsMath.android.kt:79:12 'copyTo(Bitmap!): Unit' is deprecated. Deprecated in Java
26+
.../src/commonMain/kotlin/example/imageviewer/ImageViewer.common.kt:51:26 'with(ExitTransition): ContentTransform' is deprecated. Infix fun EnterTransition.with(ExitTransition) has been renamed to togetherWith
27+
.../src/commonMain/kotlin/example/imageviewer/ImageViewer.common.kt:53:26 'with(ExitTransition): ContentTransform' is deprecated. Infix fun EnterTransition.with(ExitTransition) has been renamed to togetherWith
28+
.../src/commonMain/kotlin/example/imageviewer/ImageViewer.common.kt:55:61 'with(ExitTransition): ContentTransform' is deprecated. Infix fun EnterTransition.with(ExitTransition) has been renamed to togetherWith
29+
.../src/commonMain/kotlin/example/imageviewer/ImageViewer.common.kt:58:15 Destructured parameter 'index' is never used
30+
.../src/commonMain/kotlin/example/imageviewer/view/FullscreenImage.kt:142:5 Parameter 'pictureName' is never used
31+
.../src/commonMain/kotlin/example/imageviewer/view/FullscreenImage.kt:144:5 Parameter 'filters' is never used
32+
.../src/commonMain/kotlin/example/imageviewer/view/FullscreenImage.kt:145:5 Parameter 'selectedFilters' is never used
33+
.../src/commonMain/kotlin/example/imageviewer/view/FullscreenImage.kt:146:5 Parameter 'onSelectFilter' is never used
34+
.../src/commonMain/kotlin/example/imageviewer/view/FullscreenImage.kt:50:13 Condition 'picture != null' is always 'true'
35+
.../src/commonMain/kotlin/example/imageviewer/view/GalleryScreen.kt:254:5 Parameter 'dependencies' is never used
36+
.../src/commonMain/kotlin/example/imageviewer/view/GalleryScreen.kt:264:15 Variable 'idx' is never used
37+
.../src/commonMain/kotlin/example/imageviewer/view/GalleryScreen.kt:52:5 Parameter 'photoGallery' is never used
38+
.../src/commonMain/kotlin/example/imageviewer/view/MemoryScreen.kt:263:5 Parameter 'index' is never used
39+
.../src/commonMain/kotlin/example/imageviewer/view/MemoryScreen.kt:44:5 Parameter 'photoGallery' is never used
40+
.../src/commonMain/kotlin/example/imageviewer/view/PreviewImage.common.kt:56:23 'with(ExitTransition): ContentTransform' is deprecated. Infix fun EnterTransition.with(ExitTransition) has been renamed to togetherWith
41+
.../src/commonMain/kotlin/example/imageviewer/view/PreviewImage.common.kt:68:25 Condition 'currentPicture != null' is always 'true'

0 commit comments

Comments
 (0)