Refactor build scripts.

spine-examples · Apr 17, 2024 · bad4066 · bad4066
1 parent 20a1c2b
commit bad4066
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 91 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,30 +42,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     standardSpineSdkRepositories()
 
-    val spine = io.spine.internal.dependency.Spine
-    val validation = io.spine.internal.dependency.Validation
-    val protoData = io.spine.internal.dependency.ProtoData
-    val logging = io.spine.internal.dependency.Spine.Logging
-
     doForceVersions(configurations)
-    configurations {
-        all {
-            exclude(group = "io.spine", module = "spine-logging-backend")
 
-            resolutionStrategy {
-                force(
-                    io.spine.internal.dependency.Grpc.api,
-                    spine.reflect,
-                    spine.base,
-                    spine.toolBase,
-                    spine.server,
-                    protoData.pluginLib,
-                    logging.lib,
-                    validation.runtime
-                )
-            }
-        }
-    }
     dependencies {
         classpath(io.spine.internal.dependency.Spine.McJava.pluginLib)
     }
@@ -94,30 +72,7 @@ allprojects {
     // Define the repositories universally for all modules, including the root.
     repositories.standardToSpineSdk()
 
-    val spine = io.spine.internal.dependency.Spine
-    val validation = io.spine.internal.dependency.Validation
-    val protoData = io.spine.internal.dependency.ProtoData
-    val logging = io.spine.internal.dependency.Spine.Logging
-
     doForceVersions(configurations)
-    configurations {
-        all {
-            exclude(group = "io.spine", module = "spine-logging-backend")
-
-            resolutionStrategy {
-                force(
-                    io.spine.internal.dependency.Grpc.api,
-                    spine.reflect,
-                    spine.base,
-                    spine.toolBase,
-                    spine.server,
-                    protoData.pluginLib,
-                    logging.lib,
-                    validation.runtime
-                )
-            }
-        }
-    }
 }
 
 // It is assumed that every module in the project requires

diff --git a/buildSrc/src/main/kotlin/DependencyResolution.kt b/buildSrc/src/main/kotlin/DependencyResolution.kt
@@ -51,13 +51,39 @@ import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.ResolutionStrategy
+import org.gradle.kotlin.dsl.exclude
+import org.gradle.kotlin.dsl.invoke
 
 /**
  * The function to be used in `buildscript` when a fully-qualified call must be made.
  */
 @Suppress("unused")
 fun doForceVersions(configurations: ConfigurationContainer) {
     configurations.forceVersions()
+
+    val spine = io.spine.internal.dependency.Spine
+    val validation = io.spine.internal.dependency.Validation
+    val protoData = io.spine.internal.dependency.ProtoData
+    val logging = io.spine.internal.dependency.Spine.Logging
+
+    configurations {
+        all {
+            exclude(group = "io.spine", module = "spine-logging-backend")
+
+            resolutionStrategy {
+                force(
+                    io.spine.internal.dependency.Grpc.api,
+                    spine.reflect,
+                    spine.base,
+                    spine.toolBase,
+                    spine.server,
+                    protoData.pluginLib,
+                    logging.lib,
+                    validation.runtime
+                )
+            }
+        }
+    }
 }
 
 /**

diff --git a/integration-tests/src/test/resources/test-project/build.gradle.kts b/integration-tests/src/test/resources/test-project/build.gradle.kts
@@ -25,8 +25,11 @@
  */
 
 import Build_gradle.Module
+import io.spine.internal.dependency.ErrorProne
+import io.spine.internal.dependency.HelloProtoData
 import io.spine.internal.dependency.Protobuf
 import io.spine.internal.dependency.Spine
+import io.spine.internal.gradle.javac.configureErrorProne
 import io.spine.internal.gradle.javac.configureJavac
 import io.spine.internal.gradle.kotlin.applyJvmToolchain
 import io.spine.internal.gradle.kotlin.setFreeCompilerArgs
@@ -37,30 +40,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     standardSpineSdkRepositories()
 
-    val spine = io.spine.internal.dependency.Spine
-    val validation = io.spine.internal.dependency.Validation
-    val protoData = io.spine.internal.dependency.ProtoData
-    val logging = io.spine.internal.dependency.Spine.Logging
-
     doForceVersions(configurations)
-    configurations {
-        all {
-            exclude(group = "io.spine", module = "spine-logging-backend")
-
-            resolutionStrategy {
-                force(
-                    io.spine.internal.dependency.Grpc.api,
-                    spine.reflect,
-                    spine.base,
-                    spine.toolBase,
-                    spine.server,
-                    protoData.pluginLib,
-                    logging.lib,
-                    validation.runtime
-                )
-            }
-        }
-    }
+
     dependencies {
         classpath(io.spine.internal.dependency.Spine.McJava.pluginLib)
     }
@@ -84,30 +65,7 @@ allprojects {
     // Define the repositories universally for all modules, including the root.
     repositories.standardToSpineSdk()
 
-    val spine = io.spine.internal.dependency.Spine
-    val validation = io.spine.internal.dependency.Validation
-    val protoData = io.spine.internal.dependency.ProtoData
-    val logging = io.spine.internal.dependency.Spine.Logging
-
     doForceVersions(configurations)
-    configurations {
-        all {
-            exclude(group = "io.spine", module = "spine-logging-backend")
-
-            resolutionStrategy {
-                force(
-                    io.spine.internal.dependency.Grpc.api,
-                    spine.reflect,
-                    spine.base,
-                    spine.toolBase,
-                    spine.server,
-                    protoData.pluginLib,
-                    logging.lib,
-                    validation.runtime
-                )
-            }
-        }
-    }
 }
 
 // It is assumed that every module in the project requires