Gradle cleanup (#142)

TWiStErRob · Feb 23, 2023 · b055d6c · b055d6c
1 parent 4f8b52a
commit b055d6c
Show file tree

Hide file tree

Showing 44 changed files with 683 additions and 234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,14 @@
 projectFilesBackup
 
 # Gradle
-build/
+# rootProject
+/build/
+# App and module collections
+/*/build/
+# Features, Components and Gradle Plugins
+/*/*/build/
+# Contracts
+/*/*/*/build/
 
 # Android
 local.properties

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
 plugins {
-	id("net.twisterrob.android-app")
-	id("build.android-base.conventions")
+	id("net.twisterrob.colorfilters.app")
 }
 
 dependencies {
@@ -16,7 +15,6 @@ dependencies {
 }
 
 dependencies {
-	androidTestImplementation(projects.component.testBaseUi)
 	androidTestImplementation(projects.feature.lighting.testFixtures)
 	androidTestImplementation(projects.feature.porterduff.testFixtures)
 	androidTestImplementation(projects.feature.matrix.testFixtures)
@@ -38,8 +36,4 @@ android {
 		}
 	}
 	*/
-
-	lint {
-		checkDependencies = true
-	}
 }
diff --git a/component/test-base-ui/build.gradle b/component/test-base-ui/build.gradle
@@ -1,7 +1,7 @@
-import static VersionCatalogExt.exclude
+import static net.twisterrob.colorfilters.build.dsl.VersionCatalogExt.exclude
 
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
 
 android {

diff --git a/component/test-base-unit/build.gradle b/component/test-base-unit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
 
 android {

diff --git a/feature/about/build.gradle b/feature/about/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 android {

diff --git a/feature/about/test-fixtures/build.gradle b/feature/about/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/feature/base/build.gradle b/feature/base/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
 
 dependencies {

diff --git a/feature/image/build.gradle b/feature/image/build.gradle
@@ -1,7 +1,7 @@
-import static VersionCatalogExt.exclude
+import static net.twisterrob.colorfilters.build.dsl.VersionCatalogExt.exclude
 
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
 
 dependencies {

diff --git a/feature/keyboard/build.gradle b/feature/keyboard/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
 
 dependencies {

diff --git a/feature/keyboard/contract/build.gradle b/feature/keyboard/contract/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.component.conventions")
+	id("net.twisterrob.colorfilters.component")
 }
diff --git a/feature/lighting/build.gradle b/feature/lighting/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 dependencies {

diff --git a/feature/lighting/test-fixtures/build.gradle b/feature/lighting/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/feature/matrix/build.gradle b/feature/matrix/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 dependencies {

diff --git a/feature/matrix/test-fixtures/build.gradle b/feature/matrix/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/feature/palette/build.gradle b/feature/palette/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 dependencies {

diff --git a/feature/palette/test-fixtures/build.gradle b/feature/palette/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/feature/porterduff/build.gradle b/feature/porterduff/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 dependencies {

diff --git a/feature/porterduff/test-fixtures/build.gradle b/feature/porterduff/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/feature/resfont/build.gradle b/feature/resfont/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id("net.twisterrob.colorfilters.feature.conventions")
+	id("net.twisterrob.colorfilters.feature")
 }
 
 dependencies {

diff --git a/feature/resfont/test-fixtures/build.gradle b/feature/resfont/test-fixtures/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id("net.twisterrob.colorfilters.test-fixtures.conventions")
+	id("net.twisterrob.colorfilters.test-fixtures")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,6 +34,7 @@ agp = "7.4.1"
 # https://github.com/TWiStErRob/net.twisterrob.gradle/releases
 twisterrob = "0.15"
 
+java = "1.8"
 # https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md
 kotlin = "1.8.10"
 # https://github.com/detekt/detekt/releases

diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
@@ -28,8 +28,8 @@ gradlePlugin {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-	kotlinOptions {
-		allWarningsAsErrors = true
+	compilerOptions {
+		allWarningsAsErrors.set(true)
 	}
 }
 

diff --git a/gradle/plugins/gradle.properties b/gradle/plugins/gradle.properties
@@ -0,0 +1 @@
+org.gradle.warning.mode=all
diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.jar b/gradle/plugins/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.properties b/gradle/plugins/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists