Remove circuit submodule, use GPR snapshot version

.github/workflows/ci.yml

@@ -11,8 +11,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: true
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -25,11 +23,6 @@ jobs:
         with:
           cache-disabled: true
 
-      # Temporary job to handle the publishing of Circuit from included submodule
-      - name: Publish circuit snapshot (temporary)
-        run: ./gradlew publishToMavenLocal
-        working-directory: ./circuit
-
       - name: Lint
         run: ./gradlew lint
 
@@ -39,8 +32,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: true
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -53,12 +44,6 @@ jobs:
         with:
           cache-disabled: true
 
-
-      # Temporary job to handle the publishing of Circuit from included submodule
-      - name: Publish circuit snapshot (temporary)
-        run: ./gradlew publishToMavenLocal
-        working-directory: ./circuit
-
       - name: Decrypt secrets
         run: ./release/decrypt-secrets.sh
         env:

common/screens/build.gradle.kts

@@ -1,7 +1,11 @@
+import dev.sanson.buildlogic.configureRepositoriesForGithubPackages
+
 plugins {
     id("dev.sanson.android.library.core")
 }
 
+configureRepositoriesForGithubPackages()
+
 android {
     namespace = "dev.sanson.lightroom.screens"
 }

gradle/build-logic/convention/src/main/kotlin/dev/sanson/buildlogic/Ci.kt

@@ -0,0 +1,3 @@
+package dev.sanson.buildlogic
+
+val isCi get() = !System.getenv("CI").isNullOrEmpty()

gradle/build-logic/convention/src/main/kotlin/dev/sanson/buildlogic/Circuit.kt

@@ -5,10 +5,36 @@ import com.google.devtools.ksp.gradle.KspExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.repositories
+
+// TODO(jamiesanson) - #3 - Revert once circuit hilt support lands
+fun Project.configureRepositoriesForGithubPackages() {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url = uri("https://maven.pkg.github.com/jamiesanson/circuit")
+            if (isCi) {
+                credentials {
+                    username = System.getenv("GITHUB_ACTOR")
+                    password = System.getenv("GITHUB_TOKEN")
+                }
+            } else {
+                credentials {
+                    username = project.property("gpr.user") as String
+                    password = project.property("gpr.key") as String
+                }
+            }
+        }
+    }
+}
 
 internal fun Project.configureCircuit(useHilt: Boolean = true) {
     val libs = versionCatalog
 
+    // TODO(jamiesanson) - #3 - Revert once circuit hilt support lands
+    configureRepositoriesForGithubPackages()
+
     with(pluginManager) {
         if (!isKspPluginApplied(this@configureCircuit)) {
             apply(Plugins.Ksp)

gradle/libs.versions.toml

@@ -15,9 +15,9 @@ androidx-hilt-navigation-compose = "1.1.0"
 androidx-lifecycle = "2.6.2"
 androidx-work = "2.8.1"
 
-circuit = "0.16.0-SNAPSHOT"
+circuit = "0.17.0-SNAPSHOT"
 
-coil = "2.4.0"
+coil = "2.5.0"
 
 compose-bom = "2023.10.01"
 compose-compiler = "1.5.4"

settings.gradle.kts

@@ -11,11 +11,11 @@ pluginManagement {
 }
 
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    // TODO(jamiesanson) - #3 - Revert once circuit hilt support lands
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
     repositories {
         google()
         mavenCentral()
-        mavenLocal()
     }
 }