From bf104a1d850d82ae65e0f39df7ee0c8f33d74c24 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 19 Apr 2023 12:29:27 +0530
Subject: [PATCH] chore(build): reorder DSL declarations

---
 android/build.gradle.kts   | 14 +++++++-------
 benchmark/build.gradle.kts |  4 ++--
 common/build.gradle.kts    | 28 +++++++++++++++-------------
 core/build.gradle.kts      |  4 ++--
 database/build.gradle.kts  |  4 ++--
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index a2361550..e12fb656 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -17,13 +17,6 @@ plugins {
   alias(libs.plugins.whetstone)
 }
 
-whetstone {
-  addOns {
-    compose.set(true)
-    workManager.set(true)
-  }
-}
-
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
@@ -43,6 +36,13 @@ android {
   }
 }
 
+whetstone {
+  addOns {
+    compose.set(true)
+    workManager.set(true)
+  }
+}
+
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
   implementation(platform(libs.okhttp.bom))
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index bf75e7db..58605f2a 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -43,6 +43,8 @@ android {
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
+androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "benchmark" } }
+
 dependencies {
   implementation(libs.androidx.benchmark.macro.junit4)
   implementation(libs.androidx.profileinstaller)
@@ -53,5 +55,3 @@ dependencies {
   implementation(libs.androidx.test.runner)
   implementation(libs.androidx.test.uiautomator)
 }
-
-androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "benchmark" } }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 86342af2..dde87f3d 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -4,6 +4,8 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
+@file:Suppress("UnstableApiUsage")
+
 plugins {
   id("dev.msfjarvis.claw.kotlin-android")
   id("dev.msfjarvis.claw.android-library")
@@ -11,10 +13,22 @@ plugins {
   alias(libs.plugins.whetstone)
 }
 
-anvil { generateDaggerFactories.set(true) }
+android {
+  buildFeatures {
+    androidResources = true
+    compose = true
+  }
+  composeOptions {
+    useLiveLiterals = false
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+  }
+  namespace = "dev.msfjarvis.claw.common"
+}
 
 androidComponents { beforeVariants { it.enableUnitTest = false } }
 
+anvil { generateDaggerFactories.set(true) }
+
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
   api(libs.napier)
@@ -39,15 +53,3 @@ dependencies {
   testImplementation(kotlin("test-junit"))
   testImplementation(libs.testparameterinjector)
 }
-
-android {
-  buildFeatures {
-    androidResources = true
-    compose = true
-  }
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
-  namespace = "dev.msfjarvis.claw.common"
-}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index d1eb5b75..e36e4868 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -11,10 +11,10 @@ plugins {
   alias(libs.plugins.whetstone)
 }
 
-anvil { generateDaggerFactories.set(true) }
-
 android { namespace = "dev.msfjarvis.claw.core" }
 
+anvil { generateDaggerFactories.set(true) }
+
 dependencies {
   api(libs.kotlinx.serialization.json)
   api(libs.okhttp.loggingInterceptor)
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 36c6c511..14193944 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -12,10 +12,10 @@ plugins {
   alias(libs.plugins.whetstone)
 }
 
-anvil { generateDaggerFactories.set(true) }
-
 android { namespace = "dev.msfjarvis.claw.database" }
 
+anvil { generateDaggerFactories.set(true) }
+
 sqldelight {
   databases {
     create("LobstersDatabase") {