From 9ff08c22675f8676a806b9ffe3fcb9d340989352 Mon Sep 17 00:00:00 2001
From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Mon, 28 Feb 2022 18:50:21 +0200
Subject: [PATCH] Combined some dependency versions as variables

---
 Plan/build.gradle        | 19 +++++++++++--------
 Plan/common/build.gradle |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Plan/build.gradle b/Plan/build.gradle
index ff4c035c5..6cb92bbb9 100644
--- a/Plan/build.gradle
+++ b/Plan/build.gradle
@@ -61,7 +61,6 @@ subprojects {
 
     ext {
         daggerVersion = "2.41"
-        daggerCompilerVersion = "2.41"
 
         palVersion = "5.0.0"
 
@@ -83,10 +82,14 @@ subprojects {
         slf4jVersion = "1.7.36"
         geoIpVersion = "2.16.1"
         gsonVersion = "2.9.0"
+        dependencyDownloadVersion = "1.2.1"
+
         bstatsVersion = "2.2.1"
         placeholderapiVersion = "2.11.1"
         nkPlaceholderapiVersion = "1.4-SNAPSHOT"
 
+        junitVersion = "5.8.2"
+        mockitoVersion = "4.3.1"
         testContainersVersion = "1.16.3"
     }
 
@@ -105,15 +108,15 @@ subprojects {
     dependencies {
         // Dependency Injection used across the project
         implementation "com.google.dagger:dagger:$daggerVersion"
-        annotationProcessor "com.google.dagger:dagger-compiler:$daggerCompilerVersion"
-        testAnnotationProcessor "com.google.dagger:dagger-compiler:$daggerCompilerVersion"
+        annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
+        testAnnotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
 
         // Test Tooling Dependencies
-        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'      // JUnit 5
-        testImplementation "org.mockito:mockito-core:4.3.1"                // Mockito Core
-        testImplementation "org.mockito:mockito-junit-jupiter:4.3.1"       // Mockito JUnit 5 Extension
-        testImplementation "org.seleniumhq.selenium:selenium-java:4.1.2" // Selenium (Browser tests)
-        testImplementation "com.jayway.awaitility:awaitility:1.7.0"         // Awaitility (Concurrent wait conditions)
+        testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"      // JUnit 5
+        testImplementation "org.mockito:mockito-core:$mockitoVersion"           // Mockito Core
+        testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"  // Mockito JUnit 5 Extension
+        testImplementation "org.seleniumhq.selenium:selenium-java:4.1.2"        // Selenium (Browser tests)
+        testImplementation "com.jayway.awaitility:awaitility:1.7.0"             // Awaitility (Concurrent wait conditions)
 
         // Testing dependencies required by Plan
         testImplementation "org.xerial:sqlite-jdbc:$sqliteVersion"    // SQLite
diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle
index 1314b7b26..b27afb642 100644
--- a/Plan/common/build.gradle
+++ b/Plan/common/build.gradle
@@ -1,7 +1,7 @@
 import dev.vankka.dependencydownload.task.GenerateDependencyDownloadResourceTask
 
 plugins {
-    id "dev.vankka.dependencydownload.plugin" version "1.2.1"
+    id "dev.vankka.dependencydownload.plugin" version "$dependencyDownloadVersion"
 }
 
 configurations {
@@ -41,7 +41,7 @@ dependencies {
     implementation "com.maxmind.geoip2:geoip2:$geoIpVersion"
     implementation "com.google.code.gson:gson:$gsonVersion"
 
-    implementation("dev.vankka:dependencydownload-runtime:1.2.1") {
+    implementation("dev.vankka:dependencydownload-runtime:$dependencyDownloadVersion") {
         // Effectively disables relocating
         exclude module: "jar-relocator"
     }