Add convention plugins to version catalog (droidconKE#223)

* Add convention plugins to version catalogs * Upgrade gradle to 8.4 From gradle 8.1+ plugin alias declarations are no longer highlighted as an error.
emmanuelmuturia · Oct 15, 2023 · cf411ac · cf411ac
1 parent 70982d4
commit cf411ac
Show file tree

Hide file tree

Showing 12 changed files with 203 additions and 132 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.application")
-    id("droidconke.android.hilt")
-    id("droidconke.android.application.firebase")
+    alias(libs.plugins.droidconke.android.application)
+    alias(libs.plugins.droidconke.android.hilt)
+    alias(libs.plugins.droidconke.android.application.firebase)
 }
 
 android {

diff --git a/chai/build.gradle.kts b/chai/build.gradle.kts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.library")
-    id("droidconke.android.library.compose")
+    alias(libs.plugins.droidconke.android.library)
+    alias(libs.plugins.droidconke.android.library.compose)
 }
 
 android {

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.library")
-    id("droidconke.android.hilt")
-    id("droidconke.android.library.firebase")
+    alias(libs.plugins.droidconke.android.library)
+    alias(libs.plugins.droidconke.android.hilt)
+    alias(libs.plugins.droidconke.android.library.firebase)
     kotlin("plugin.serialization")
 }
 

diff --git a/datasource/local/build.gradle.kts b/datasource/local/build.gradle.kts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.library")
-    id("droidconke.android.room")
-    id("droidconke.android.hilt")
-    id("droidconke.android.library.firebase")
+    alias(libs.plugins.droidconke.android.library)
+    alias(libs.plugins.droidconke.android.room)
+    alias(libs.plugins.droidconke.android.hilt)
+    alias(libs.plugins.droidconke.android.library.firebase)
 }
 
 android {

diff --git a/datasource/remote/build.gradle.kts b/datasource/remote/build.gradle.kts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.library")
-    id("droidconke.android.hilt")
-    id("droidconke.android.library.firebase")
+    alias(libs.plugins.droidconke.android.library)
+    alias(libs.plugins.droidconke.android.hilt)
+    alias(libs.plugins.droidconke.android.library.firebase)
     kotlin("plugin.serialization")
 }
 

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 plugins {
-    id("droidconke.android.library")
+    alias(libs.plugins.droidconke.android.library)
 }
 
 android {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -131,3 +131,12 @@ spotless = "com.diffplug.spotless:6.4.2"
 toml-checker = "com.github.ben-manes.versions:0.42.0"
 toml-updater = "nl.littlerobots.version-catalog-update:0.3.1"
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+
+# Convention plugins defined in the project
+droidconke-android-library = { id = "droidconke.android.library", version = "unspecified" }
+droidconke-android-room = { id = "droidconke.android.room", version = "unspecified" }
+droidconke-android-hilt = { id = "droidconke.android.hilt", version = "unspecified" }
+droidconke-android-library-compose = { id = "droidconke.android.library.compose", version = "unspecified" }
+droidconke-android-application-firebase = { id = "droidconke.android.application.firebase", version = "unspecified" }
+droidconke-android-library-firebase = { id = "droidconke.android.library.firebase", version = "unspecified" }
+droidconke-android-application = { id = "droidconke.android.application", version = "unspecified" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 11 12:19:01 EAT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists