Fixed issues after merging with .jvm approach

gmazzo · Dec 20, 2023 · a81c26b · a81c26b
1 parent f6c2dc9
commit a81c26b
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 252 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .gradle/
 .idea/
 build/
+kotlin-js-store/
diff --git a/demo-project/app/build.gradle.kts b/demo-project/app/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.multiplatform)
@@ -39,3 +42,10 @@ dependencies {
 
     commonTestImplementation(libs.kotlin.test)
 }
+
+tasks.withType<KotlinJsIrLink>().configureEach {
+    notCompatibleWithConfigurationCache("uses Task.project")
+}
+tasks.withType<KotlinNativeLink>().configureEach {
+    notCompatibleWithConfigurationCache("uses Task.project")
+}
diff --git a/demo-project/lib2/build.gradle.kts b/demo-project/lib2/build.gradle.kts
@@ -1,12 +1,7 @@
 plugins {
-<<<<<<<< HEAD:plugin/jvm-plugin/src/integrationTest/resources/project/lib2/build.gradle.kts
-    id("com.android.library")
-    id("io.github.gmazzo.codeowners.jvm")
-========
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     id("io.github.gmazzo.codeowners.kotlin")
->>>>>>>> 91353a5 (Changed plugin id to `io.github.gmazzo.codeowners.kotlin`):demo-project/lib2/build.gradle.kts
 }
 
 android {

diff --git a/plugin/jvm-plugin/build.gradle.kts b/plugin/jvm-plugin/build.gradle.kts
@@ -3,8 +3,8 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.samWithReceiver)
-    alias(libs.plugins.buildConfig)
     alias(libs.plugins.gradle.pluginPublish)
+    com.github.gmazzo.buildconfig
     `java-integration-tests`
     `maven-central-publish`
     jacoco
@@ -23,14 +23,14 @@ dependencies {
         plugin.map { create("${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}") }
 
     compileOnly(gradleKotlinDsl())
-    compileOnly(plugin(libs.plugins.android))
+    compileOnly(plugin(libs.plugins.android.application))
 
     implementation(libs.jgit)
 
     testImplementation(gradleKotlinDsl())
     testRuntimeOnly(plugin(libs.plugins.kotlin.jvm))
 
-    pluginUnderTestImplementation(plugin(libs.plugins.android))
+    pluginUnderTestImplementation(plugin(libs.plugins.android.application))
     pluginUnderTestImplementation(plugin(libs.plugins.kotlin.jvm))
 }
 

diff --git a/...plugin/src/integrationTest/resources/project/app/src/main/kotlin/org/test/app/AppClass.kt b/...plugin/src/integrationTest/resources/project/app/src/main/kotlin/org/test/app/AppClass.kt
@@ -1,3 +1,4 @@
 package org.test.app
 
-object AppClass
+class AppClass {
+}
diff --git a/plugin/jvm-plugin/src/integrationTest/resources/project/lib2/build.gradle.kts b/plugin/jvm-plugin/src/integrationTest/resources/project/lib2/build.gradle.kts
@@ -1,12 +1,6 @@
 plugins {
-<<<<<<<< HEAD:plugin/jvm-plugin/src/integrationTest/resources/project/lib2/build.gradle.kts
     id("com.android.library")
     id("io.github.gmazzo.codeowners.jvm")
-========
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    id("io.github.gmazzo.codeowners.kotlin")
->>>>>>>> 91353a5 (Changed plugin id to `io.github.gmazzo.codeowners.kotlin`):demo-project/lib2/build.gradle.kts
 }
 
 android {
@@ -21,7 +15,9 @@ android {
 }
 
 dependencies {
-    implementation(projects.demoProject.lib1)
+    implementation(project(":utils"))
+}
 
-    testImplementation(libs.kotlin.test)
+androidComponents.onVariants {
+    it.unitTest!!.codeOwners.enabled.set(false)
 }
diff --git a/...integrationTest/resources/project/utils/src/test/java/org/test/utils/UtilsOwnersTest.java b/...integrationTest/resources/project/utils/src/test/java/org/test/utils/UtilsOwnersTest.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.test.utils.more.MoreUtils;
 
-import static io.github.gmazzo.codeowners.CodeOwnersUtils.getCodeOwners;
-import static kotlin.collections.SetsKt.setOf;
+import static io.github.gmazzo.codeowners.CodeOwners.getCodeOwners;
 import static org.junit.Assert.assertEquals;
+import static kotlin.collections.SetsKt.setOf;
 
 public class UtilsOwnersTest {
 
@@ -17,7 +17,6 @@ public void ownerOfUtils() {
     @Test
     public void ownerOfMoreUtils() {
         assertEquals(setOf("utils-devs"), getCodeOwners(MoreUtils.class));
-        assertEquals(setOf("utils-more"), getCodeOwners(MoreUtils.Companion.class));
     }
 
 }
diff --git a/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersExtension.kt b/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersExtension.kt
@@ -1,5 +1,6 @@
 package io.github.gmazzo.codeowners
 
+import io.github.gmazzo.codeowners.matcher.CodeOwnersFile
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property

diff --git a/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPlugin.kt b/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPlugin.kt
@@ -5,6 +5,7 @@ package io.github.gmazzo.codeowners
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Component
 import com.android.build.api.variant.HasAndroidTest
+import io.github.gmazzo.codeowners.matcher.CodeOwnersFile
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Plugin
 import org.gradle.api.Project

diff --git a/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersTask.kt b/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersTask.kt
@@ -1,5 +1,6 @@
 package io.github.gmazzo.codeowners
 
+import io.github.gmazzo.codeowners.matcher.CodeOwnersFile
 import org.eclipse.jgit.ignore.FastIgnoreRule
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection

diff --git a/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersTransform.kt b/plugin/jvm-plugin/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwnersTransform.kt
@@ -1,5 +1,6 @@
 package io.github.gmazzo.codeowners
 
+import io.github.gmazzo.codeowners.matcher.CodeOwnersFile
 import org.gradle.api.artifacts.transform.CacheableTransform
 import org.gradle.api.artifacts.transform.InputArtifact
 import org.gradle.api.artifacts.transform.TransformAction

diff --git a/plugin/jvm-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPluginTest.kt b/plugin/jvm-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPluginTest.kt
@@ -3,6 +3,7 @@ package io.github.gmazzo.codeowners
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.exclude
+import org.gradle.kotlin.dsl.withType
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
@@ -11,11 +12,7 @@ import java.io.File
 import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-<<<<<<<< HEAD:plugin/jvm-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPluginTest.kt
 class CodeOwnersJVMPluginTest {
-========
-class CodeOwnersKotlinPluginTest {
->>>>>>>> 91353a5 (Changed plugin id to `io.github.gmazzo.codeowners.kotlin`):plugin/kotlin-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersKotlinPluginTest.kt
 
     private val root = ProjectBuilder.builder()
         .withName("root")
@@ -51,11 +48,7 @@ class CodeOwnersKotlinPluginTest {
 
         root.allprojects {
             apply(plugin = "java")
-<<<<<<<< HEAD:plugin/jvm-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMPluginTest.kt
             apply<CodeOwnersJVMPlugin>()
-========
-            apply<CodeOwnersKotlinPlugin>()
->>>>>>>> 91353a5 (Changed plugin id to `io.github.gmazzo.codeowners.kotlin`):plugin/kotlin-plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersKotlinPluginTest.kt
 
             repositories.mavenCentral()
             configurations.configureEach {

diff --git a/plugin/kotlin-core/build.gradle.kts b/plugin/kotlin-core/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     `jvm-convention-module`
@@ -18,3 +21,10 @@ dependencies {
     commonTestImplementation(libs.kotlin.test)
     commonTestImplementation(platform(libs.junit.bom))
 }
+
+tasks.withType<KotlinJsIrLink>().configureEach {
+    notCompatibleWithConfigurationCache("uses Task.project")
+}
+tasks.withType<KotlinNativeLink>().configureEach {
+    notCompatibleWithConfigurationCache("uses Task.project")
+}
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/AnotherBaz.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/AnotherBaz.kt
@@ -0,0 +1,6 @@
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("baz")
+class AnotherBaz
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/Bar.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/Bar.kt
@@ -0,0 +1,6 @@
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("bar")
+abstract class Bar
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/BarImpl.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/BarImpl.kt
@@ -0,0 +1,15 @@
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("bar")
+object BarImpl : Bar() {
+
+    @CodeOwners("bar-inner")
+    object Inner {
+        fun throwException() {
+            error("Bar")
+        }
+    }
+
+}
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/Baz.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/Baz.kt
@@ -0,0 +1,9 @@
+@file:CodeOwners("baz")
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("baz")
+class Baz
+
+fun baz() = println("baz")
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/Foo.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/Foo.kt
@@ -0,0 +1,6 @@
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("foo")
+interface Foo
diff --git a/plugin/kotlin-core/src/commonTest/kotlin/org.test/FooImpl.kt b/plugin/kotlin-core/src/commonTest/kotlin/org.test/FooImpl.kt
@@ -0,0 +1,6 @@
+package org.test
+
+import io.github.gmazzo.codeowners.CodeOwners
+
+@CodeOwners("foo")
+object FooImpl : Foo
diff --git a/plugin/kotlin-core/src/jvmMain/kotlin/io/github/gmazzo/codeowners/CodeOwners.kt b/plugin/kotlin-core/src/jvmMain/kotlin/io/github/gmazzo/codeowners/CodeOwners.kt
@@ -2,6 +2,7 @@
 
 package io.github.gmazzo.codeowners
 
+import java.lang.reflect.Proxy
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.jvm.javaMethod
@@ -10,7 +11,10 @@ actual val KClass<*>.codeOwners: Set<String>?
     get() = java.codeOwners
 
 val Class<*>.codeOwners: Set<String>?
-    get() = getAnnotation(CodeOwners::class.java)?.owners?.toSet()
+    get() = when {
+        Proxy.isProxyClass(this) -> resolveInterfacesIfProxy().mapNotNull { it.codeOwners }.flatten().toSet()
+        else -> getAnnotation(CodeOwners::class.java)?.owners?.toSet()
+    }
 
 val KFunction<*>.codeOwners: Set<String>?
     get() = javaMethod?.declaringClass?.codeOwners
@@ -27,3 +31,8 @@ private fun StackTraceElement.getCodeOwners(classLoader: ClassLoader) = try {
 } catch (e: Throwable) {
     null
 }
+
+private fun Class<*>.resolveInterfacesIfProxy() = when {
+    !Proxy.isProxyClass(this) -> sequenceOf(this)
+    else -> interfaces.asSequence()
+}
diff --git a/plugin/kotlin-core/src/jvmTest/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMTest.kt b/plugin/kotlin-core/src/jvmTest/kotlin/io/github/gmazzo/codeowners/CodeOwnersJVMTest.kt
diff --git a/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt b/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt
@@ -1,9 +1,17 @@
 package io.github.gmazzo.codeowners
 
-import org.test.*
+import org.test.AnotherBaz
+import org.test.Bar
+import org.test.BarImpl
+import org.test.Baz
+import org.test.Foo
+import org.test.FooImpl
+import org.test.baz
+import java.lang.reflect.Proxy
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+// it only applies to JVM as annotations are not available on other targets
 class CodeOwnersTest {
 
     @Test
@@ -16,7 +24,7 @@ class CodeOwnersTest {
     fun reports_Bar_owners_correctly() {
         assertEquals(setOf("bar"), codeOwnersOf<Bar>())
         assertEquals(setOf("bar"), BarImpl::class.codeOwners)
-        assertEquals(setOf("bar"), codeOwnersOf<BarImpl.Inner>())
+        assertEquals(setOf("bar-inner"), codeOwnersOf<BarImpl.Inner>())
     }
 
     @Test
@@ -31,7 +39,19 @@ class CodeOwnersTest {
 
         val exception = runCatching { myFun() }.exceptionOrNull()
 
-        assertEquals(setOf("bar"), exception?.codeOwners)
+        assertEquals(setOf("bar-inner"), exception?.codeOwners)
+    }
+
+    @Test
+    fun `reports_proxy_of_Foo_owners_correctly`() {
+        val proxy = Proxy.newProxyInstance(javaClass.classLoader, arrayOf(Foo::class.java)) { _, _, _ -> }
+
+        assertEquals(setOf("foo"), proxy::class.codeOwners)
+    }
+
+    @Test
+    fun `reports_baz_function_owners_correctly`() {
+        assertEquals(setOf("baz"), ::baz.codeOwners)
     }
 
 }