Fixed Gradle plugin & updated Android tests

.github/workflows/release.yml

@@ -68,14 +68,9 @@ jobs:
         working-directory: tests-projects/tests-jvm-junit5
         run: ../../gradlew --stacktrace check
         shell: bash
-      - name: Check plugin with Android old layout (ubuntu)
+      - name: Check plugin with Android (ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-old
-        run: ../../gradlew --stacktrace check
-        shell: bash
-      - name: Check plugin with Android new layout (ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-new
+        working-directory: tests-projects/tests-android
         run: ../../gradlew --stacktrace check
         shell: bash
       - name: Upload (macos / windows)

.github/workflows/snapshot.yml

@@ -66,14 +66,9 @@ jobs:
         working-directory: tests-projects/tests-jvm-junit5
         run: ../../gradlew --stacktrace check
         shell: bash
-      - name: Check plugin with Android old layout (ubuntu)
+      - name: Check plugin with Android (ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-old
-        run: ../../gradlew --stacktrace check
-        shell: bash
-      - name: Check plugin with Android new layout (ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-new
+        working-directory: tests-projects/tests-android
         run: ../../gradlew --stacktrace check
         shell: bash
       - name: Upload (macos / windows)

.github/workflows/test.yml

@@ -52,13 +52,8 @@ jobs:
         working-directory: tests-projects/tests-jvm-junit5
         run: ../../gradlew --stacktrace check
         shell: bash
-      - name: Check plugin with Android old layout (ubuntu)
+      - name: Check plugin with Android (ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-old
-        run: ../../gradlew --stacktrace check
-        shell: bash
-      - name: Check plugin with Android new layout (ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: tests-projects/tests-android-new
+        working-directory: tests-projects/tests-android
         run: ../../gradlew --stacktrace check
         shell: bash

mockmp-gradle-plugin/src/main/kotlin/org/kodein/mock/gradle/MocKMPGradlePlugin.kt

@@ -92,15 +92,19 @@ class MocKMPGradlePlugin : Plugin<Project> {
 
             configureKsp(project, ext)
 
-            // Adding KSP JVM as a dependency to all Kotlin compilations
-            project.tasks.withType<KotlinCompile<*>>().all {
-                if (name.startsWith("compile") && name.contains("TestKotlin")) {
-                    when (jvmTarget.preset!!.name) {
-                        "jvm" -> dependsOn("kspTestKotlin${jvmTarget.name.replaceFirstChar { it.titlecase() }}")
-                        "android" -> dependsOn("kspDebugUnitTestKotlin${jvmTarget.name.replaceFirstChar { it.titlecase() }}")
+            // For some reason, the simple fact of calling `project.tasks.withType<KotlinCompile<*>>()`
+            // breaks KSP if not set in a deep level of afterEvaluate :(
+            afterEvaluate { afterEvaluate {
+                // Adding KSP JVM as a dependency to all Kotlin compilations
+                project.tasks.withType<KotlinCompile<*>>().all {
+                    if (name.startsWith("compile") && name.contains("TestKotlin")) {
+                        when (jvmTarget.preset!!.name) {
+                            "jvm" -> dependsOn("kspTestKotlin${jvmTarget.name.replaceFirstChar { it.titlecase() }}")
+                            "android" -> dependsOn("kspDebugUnitTestKotlin${jvmTarget.name.replaceFirstChar { it.titlecase() }}")
+                        }
                     }
                 }
-            }
+            } }
         }
     }
 
@@ -121,7 +125,6 @@ class MocKMPGradlePlugin : Plugin<Project> {
                 SourceSetTarget.CommonMain -> executeOnMain(target, ext)
                 SourceSetTarget.CommonTest_Via_JVM -> executeOnTests(target, ext)
             }
-
         }
     }
 

tests-projects/tests-android-new/build.gradle.kts → tests-projects/tests-android/build.gradle.kts

@@ -27,7 +27,7 @@ android {
 }
 
 kotlin {
-    android()
+    androidTarget()
     ios()
 
     sourceSets {

tests-projects/tests-android-new/gradle.properties → tests-projects/tests-android/gradle.properties

@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 
 android.useAndroidX=true
 android.nonTransitiveRClass=true
-kotlin.mpp.androidSourceSetLayoutVersion=2