From 0b092b352dc29ce69f6f126eb7857a1243a6ef62 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 23 Feb 2021 11:46:06 +0100
Subject: Extract testing conventions from Kotlin conventions

This change extracts the configuration for test from the Kotlin library
conventions.
---
 simulator/buildSrc/src/main/kotlin/Versions.kt | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 simulator/buildSrc/src/main/kotlin/Versions.kt

(limited to 'simulator/buildSrc/src/main/kotlin/Versions.kt')

diff --git a/simulator/buildSrc/src/main/kotlin/Versions.kt b/simulator/buildSrc/src/main/kotlin/Versions.kt
new file mode 100644
index 00000000..d845c4bd
--- /dev/null
+++ b/simulator/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,50 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2019 atlarge-research
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * This class contains the versions of the dependencies shared by the different
+ * subprojects.
+ */
+public object Versions {
+
+    /**
+     * The library for testing the projects.
+     */
+    val JUNIT_JUPITER = "5.7.1"
+
+    /**
+     * The library for hosting the tests.
+     */
+    val JUNIT_PLATFORM = "1.7.1"
+
+    /**
+     * Logging facade.
+     */
+    val SLF4J = "1.7.30"
+
+    /**
+     * Kotlin coroutines support
+     */
+    val KOTLINX_COROUTINES = "1.4.2"
+}
-- 
cgit v1.2.3


From 90de768b8bfb3acc222f508d2e602ef3b7f1ff91 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 23 Feb 2021 12:05:59 +0100
Subject: Move dependency versions to gradle.properties

This change moves the version of the dependencies from buildSrc to
gradle.properties to prevent recompilation when changing dependency
versions.
---
 simulator/buildSrc/src/main/kotlin/Versions.kt | 41 +++++++++++++++++---------
 1 file changed, 27 insertions(+), 14 deletions(-)

(limited to 'simulator/buildSrc/src/main/kotlin/Versions.kt')

diff --git a/simulator/buildSrc/src/main/kotlin/Versions.kt b/simulator/buildSrc/src/main/kotlin/Versions.kt
index d845c4bd..fcf3c778 100644
--- a/simulator/buildSrc/src/main/kotlin/Versions.kt
+++ b/simulator/buildSrc/src/main/kotlin/Versions.kt
@@ -22,29 +22,42 @@
  * SOFTWARE.
  */
 
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
 /**
  * This class contains the versions of the dependencies shared by the different
  * subprojects.
  */
-public object Versions {
-
+public class Versions(private val project: Project) {
     /**
-     * The library for testing the projects.
+     * A delegate for obtaining configuration values from a [Project] instance.
      */
-    val JUNIT_JUPITER = "5.7.1"
+    private fun version(name: String? = null): ReadOnlyProperty<Versions, String> =
+        ReadOnlyProperty { _, property -> get(name ?: property.name) }
 
-    /**
-     * The library for hosting the tests.
-     */
-    val JUNIT_PLATFORM = "1.7.1"
+    val junitJupiter by version(name = "junit-jupiter")
+    val junitPlatform by version(name = "junit-platform")
+
+    val slf4j by version()
+    val kotlinLogging by version(name = "kotlin-logging")
+    val log4j by version()
+
+    val kotlinxCoroutines by version(name = "kotlinx-coroutines")
 
-    /**
-     * Logging facade.
-     */
-    val SLF4J = "1.7.30"
 
     /**
-     * Kotlin coroutines support
+     * Obtain the version for the specified [dependency][name].
      */
-    val KOTLINX_COROUTINES = "1.4.2"
+    operator fun get(name: String) = project.extra.get("$name.version") as String
+
+    companion object {
+        /**
+         * The JVM version to target.
+         */
+        val jvmTarget = JavaVersion.VERSION_1_8
+    }
 }
-- 
cgit v1.2.3