From 0c511b1092cd0b0b826d577f6c5ec75f0d0032d2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 23 Dec 2022 13:37:22 +0100
Subject: [PATCH] Make generated code visible

---
 app/build.gradle.kts                                      | 3 ++-
 .../kotlin/io.element.android-compose-library.gradle.kts  | 8 ++++++++
 .../src/main/kotlin/io.element.android-library.gradle.kts | 8 ++++++++
 tests/uitests/build.gradle.kts                            | 4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c906990cc9..0c3f661819 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import extension.allLibraries
 import extension.allFeatures
+import extension.allLibraries
 
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
 @Suppress("DSL_SCOPE_VIOLATION")
@@ -128,6 +128,7 @@ android {
         }
     }
 
+    // Waiting for https://github.com/google/ksp/issues/37
     applicationVariants.all {
         kotlin.sourceSets {
             getByName(name) {
diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
index 33df0c0835..2b07dd3285 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -30,6 +30,14 @@ plugins {
 android {
     androidConfig(project)
     composeConfig()
+    // Waiting for https://github.com/google/ksp/issues/37
+    libraryVariants.all {
+        kotlin.sourceSets {
+            getByName(name) {
+                kotlin.srcDir("build/generated/ksp/$name/kotlin")
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/plugins/src/main/kotlin/io.element.android-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
index b1b15c7e10..755a00f316 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
@@ -27,6 +27,14 @@ plugins {
 
 android {
     androidConfig(project)
+    // Waiting for https://github.com/google/ksp/issues/37
+    libraryVariants.all {
+        kotlin.sourceSets {
+            getByName(name) {
+                kotlin.srcDir("build/generated/ksp/$name/kotlin")
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index fb68b9b00d..d82e5f8b01 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import extension.allLibraries
 import extension.allFeatures
+import extension.allLibraries
 
 plugins {
     id("io.element.android-compose-library")
@@ -35,7 +35,7 @@ dependencies {
     kspTest(libs.showkase.processor)
 
     // TODO Move to libs
-    testImplementation("com.airbnb.android:showkase-screenshot-testing:$1.0.0-beta14")
+    testImplementation("com.airbnb.android:showkase-screenshot-testing:1.0.0-beta14")
     testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8")
 
     implementation(project(":libraries:designsystem"))