From 2989447b62bc784df05640625923ec78efa93641 Mon Sep 17 00:00:00 2001
From: Daniel Frett <daniel.frett@cru.org>
Date: Mon, 1 Jul 2024 11:21:26 -0600
Subject: [PATCH] upgrade Mockposable

---
 build-logic/settings.gradle.kts                     | 3 +++
 build-logic/src/main/kotlin/AndroidConfiguration.kt | 3 +--
 build.gradle                                        | 1 +
 gradle/libs.versions.toml                           | 5 ++---
 settings.gradle.kts                                 | 6 ++++++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 54ab2f80ff..02eeb8d2eb 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -7,6 +7,9 @@ dependencyResolutionManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 
     versionCatalogs {
diff --git a/build-logic/src/main/kotlin/AndroidConfiguration.kt b/build-logic/src/main/kotlin/AndroidConfiguration.kt
index 1c16824012..415a13b32c 100644
--- a/build-logic/src/main/kotlin/AndroidConfiguration.kt
+++ b/build-logic/src/main/kotlin/AndroidConfiguration.kt
@@ -111,8 +111,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) {
 // context(Project)
 fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableCircuit: Boolean = false) {
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion =
-        project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
+    project.pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
 
     // add our base compose dependencies
     project.dependencies.apply {
diff --git a/build.gradle b/build.gradle
index 85ca5337fd..8499bac084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,7 @@ buildscript {
 }
 
 plugins {
+    alias libs.plugins.compose.compiler apply false
     alias libs.plugins.hilt apply false
     alias libs.plugins.ksp apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 667bd1dee6..d38836a5d1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 accompanist = "0.34.0"
 android-gradle-plugin = "8.5.0"
-androidx-compose-compiler = "1.5.14"
 androidx-compose-material = "1.6.8"
 androidx-compose-ui = "1.6.8"
 androidx-core = "1.13.1"
@@ -183,7 +182,7 @@ lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
 lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
 materialComponents = "com.google.android.material:material:1.12.0"
 mockk = "io.mockk:mockk:1.13.11"
-mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.8'
+mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.9-SNAPSHOT'
 okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
 okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3" }
 onesky-gradlePlugin = "co.brainly:plugin:1.6.0"
@@ -216,7 +215,6 @@ weakdelegate = "com.github.Karumi:WeakDelegate:1.0.1"
 youtubePlayer = "com.pierfrancescosoffritti.androidyoutubeplayer:core:12.1.0"
 
 # HACK: dependencies used to trigger renovate upgrades
-androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 
 [bundles]
@@ -229,6 +227,7 @@ ktlint-rulesets = ["ktlint-rules-compose"]
 test-framework = ["junit", "kotlin-test", "androidx-test-junit", "mockk", "robolectric"]
 
 [plugins]
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "5.0.0" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e3a55bb84b..7146aeb932 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,6 +3,9 @@ pluginManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }
 
@@ -45,6 +48,9 @@ dependencyResolutionManagement {
         }
         google()
         mavenCentral()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }