Moved Versions to buildSrc using gradle kotlin-dsl base plugin.

acceptance-tests/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.ostelco.prime.gradle.Version
 
 plugins {
   kotlin("jvm")
@@ -7,41 +8,33 @@ plugins {
 }
 
 dependencies {
-
-  val kotlinVersion:String by rootProject.extra
-  val kotlinXCoroutinesVersion:String by rootProject.extra
-  val dropwizardVersion:String by rootProject.extra
-  val googleCloudVersion:String by rootProject.extra
-  val stripeVersion:String by rootProject.extra
-  val jjwtVersion:String by rootProject.extra
-  val jacksonVersion:String by rootProject.extra
-
   implementation(kotlin("stdlib-jdk8"))
   implementation(kotlin("test").toString()) {
     exclude(module = "kotlin-stdlib-common")
   }
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinXCoroutinesVersion")
 
-  implementation("io.dropwizard:dropwizard-client:$dropwizardVersion")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.kotlinXCoroutines}")
+
+  implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}")
   implementation(project(":prime-customer-api"))
   implementation(project(":diameter-test"))
   implementation(project(":ocs-grpc-api"))
 
-  implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion")
+  implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}")
 
-  implementation("com.stripe:stripe-java:$stripeVersion")
+  implementation("com.stripe:stripe-java:${Version.stripe}")
 
-  implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion")
-  runtimeOnly("io.jsonwebtoken:jjwt-impl:$jjwtVersion")
-  runtimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion")
+  implementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}")
+  runtimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}")
+  runtimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 
-  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}")
   implementation("org.zalando.phrs:jersey-media-json-gson:0.1")
 
   implementation(kotlin("test"))
   implementation(kotlin("test-junit"))
 
-  implementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
+  implementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
 application {

admin-endpoint/build.gradle.kts

@@ -1,16 +1,15 @@
+import org.ostelco.prime.gradle.Version
+
 plugins {
   kotlin("jvm")
   `java-library`
 }
 
 dependencies {
-
-  val dropwizardVersion:String by rootProject.extra
-
   implementation(project(":prime-modules"))
 
   testImplementation(project(":jersey"))
-  testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
+  testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
 apply(from = "../gradle/jacoco.gradle")

analytics-grpc-api/build.gradle.kts

@@ -4,34 +4,31 @@ import com.google.protobuf.gradle.ofSourceSet
 import com.google.protobuf.gradle.plugins
 import com.google.protobuf.gradle.protobuf
 import com.google.protobuf.gradle.protoc
+import org.ostelco.prime.gradle.Version
 
 plugins {
   `java-library`
   id("com.google.protobuf")
   idea
 }
 
-val grpcVersion:String by rootProject.extra
-val protocVersion:String by rootProject.extra
-val javaxAnnotationVersion:String by rootProject.extra
-
 dependencies {
-  api("io.grpc:grpc-netty-shaded:$grpcVersion")
-  api("io.grpc:grpc-protobuf:$grpcVersion")
-  api("io.grpc:grpc-stub:$grpcVersion")
-  api("io.grpc:grpc-core:$grpcVersion")
-  implementation("com.google.protobuf:protobuf-java:$protocVersion")
-  implementation("com.google.protobuf:protobuf-java-util:$protocVersion")
-  implementation("javax.annotation:javax.annotation-api:$javaxAnnotationVersion")
+  api("io.grpc:grpc-netty-shaded:${Version.grpc}")
+  api("io.grpc:grpc-protobuf:${Version.grpc}")
+  api("io.grpc:grpc-stub:${Version.grpc}")
+  api("io.grpc:grpc-core:${Version.grpc}")
+  implementation("com.google.protobuf:protobuf-java:${Version.protoc}")
+  implementation("com.google.protobuf:protobuf-java-util:${Version.protoc}")
+  implementation("javax.annotation:javax.annotation-api:${Version.javaxAnnotation}")
 }
 
 var protobufGeneratedFilesBaseDir: String = ""
 
 protobuf {
-  protoc { artifact = "com.google.protobuf:protoc:$protocVersion" }
+  protoc { artifact = "com.google.protobuf:protoc:${Version.protoc}" }
   plugins {
     id("grpc") {
-      artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
+      artifact = "io.grpc:protoc-gen-grpc-java:${Version.grpc}"
     }
   }
   generateProtoTasks {

analytics-module/build.gradle.kts

@@ -1,15 +1,14 @@
+import org.ostelco.prime.gradle.Version
+
 plugins {
   kotlin("jvm")
   `java-library`
 }
 
 dependencies {
-
-  val googleCloudVersion:String by rootProject.extra
-
   implementation(project(":prime-modules"))
 
-  implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion")
+  implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}")
   implementation("com.google.code.gson:gson:2.8.5")
 
   testImplementation("com.google.api:gax-grpc:1.48.1")

appleid-auth-service/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.ostelco.prime.gradle.Version
 
 plugins {
   kotlin("jvm")
@@ -8,21 +9,16 @@ plugins {
 }
 
 dependencies {
-  val jjwtVersion:String by rootProject.extra
-  val dropwizardVersion:String by rootProject.extra
-  val kotlinVersion:String by rootProject.extra
-  val jacksonVersion:String by rootProject.extra
-
   implementation(project(":prime-modules"))
   implementation(project(":firebase-extensions"))
 
-  implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion")
-  runtimeOnly("io.jsonwebtoken:jjwt-impl:$jjwtVersion")
-  runtimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion")
+  implementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}")
+  runtimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}")
+  runtimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 
-  testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
+  testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
   testImplementation(kotlin("test-junit"))
-  testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+  testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}")
 }
 
 application {

auth-server/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.ostelco.prime.gradle.Version
 
 plugins {
   kotlin("jvm")
@@ -8,25 +9,18 @@ plugins {
 }
 
 dependencies {
-
-  val kotlinVersion:String by rootProject.extra
-  val dropwizardVersion:String by rootProject.extra
-  val jacksonVersion:String by rootProject.extra
-  val jaxbVersion:String by rootProject.extra
-  val javaxActivationVersion:String by rootProject.extra
-
   implementation(kotlin("stdlib-jdk8"))
-  implementation("io.dropwizard:dropwizard-core:$dropwizardVersion")
+  implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}")
 
   implementation(project(":firebase-extensions"))
-  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") {
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") {
     exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect")
   }
 
-  runtimeOnly("javax.xml.bind:jaxb-api:$jaxbVersion")
-  runtimeOnly("javax.activation:activation:$javaxActivationVersion")
+  runtimeOnly("javax.xml.bind:jaxb-api:${Version.jaxb}")
+  runtimeOnly("javax.activation:activation:${Version.javaxActivation}")
 
-  testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
+  testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
   testImplementation(kotlin("test-junit"))
   testRuntimeOnly("org.hamcrest:hamcrest-all:1.3")
 }

build.gradle.kts

@@ -5,6 +5,7 @@ import java.net.URI
 
 // these are needed only in top-level module
 plugins {
+  base
   java
   id("project-report")
   id("com.github.ben-manes.versions") version "0.25.0"
@@ -40,48 +41,6 @@ java {
   targetCompatibility = JavaVersion.VERSION_12
 }
 
-val assertJVersion by extra("3.13.2")
-val arrowVersion by extra("0.8.2")
-val beamVersion by extra("2.15.0")
-val csvVersion by extra("1.7")
-val cxfVersion by extra("3.3.3")
-val dockerComposeJunitRuleVersion by extra("1.3.0")
-val dropwizardVersion by extra("1.3.14")
-val metricsVersion by extra("4.1.0")
-val firebaseVersion by extra("6.10.0")
-val googleCloudVersion by extra("1.90.0")
-val grpcVersion by extra("1.23.0")
-val guavaVersion by extra("28.1-jre")
-val jacksonVersion by extra("2.9.9")
-val javaxActivationVersion by extra("1.1.1")
-val javaxActivationApiVersion by extra("1.2.0")
-val javaxAnnotationVersion by extra("1.3.2")
-// Keeping it version 1.16.1 to be consistent with grpc via PubSub client lib
-// Keeping it version 1.16.1 to be consistent with netty via Firebase lib
-val jaxbVersion by extra("2.3.1")
-val jdbi3Version by extra("3.10.0")
-val jjwtVersion by extra("0.10.7")
-val junit5Version by extra("5.5.2")
-val kotlinVersion by extra("1.3.50")
-val kotlinXCoroutinesVersion by extra("1.3.1")
-val mockitoVersion by extra("3.0.0")
-val mockitoKotlinVersion by extra("2.2.0")
-val neo4jDriverVersion by extra("1.7.5")
-val neo4jVersion by extra("3.5.9")
-val opencensusVersion by extra("0.24.0")
-val postgresqlVersion by extra("42.2.8")  // See comment in ./sim-administration/simmanager/build.gradle
-val prometheusDropwizardVersion by extra("2.2.0")
-val protocVersion by extra("3.9.1")
-val slf4jVersion by extra("1.7.28")
-// IMPORTANT: When Stripe SDK library version is updated, check if the Stripe API version has changed.
-// If so, then update API version in Stripe Web Console for callback Webhooks.
-val stripeVersion by extra("12.0.0")
-val swaggerVersion by extra("2.0.9")
-val swaggerCodegenVersion by extra("2.4.8")
-val testcontainersVersion by extra("1.12.1")
-val tinkVersion by extra("1.2.2")
-val zxingVersion by extra("3.4.0")
-
 subprojects {
   tasks.withType<KotlinCompile> {
     kotlinOptions {

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+  `kotlin-dsl`
+}
+
+repositories {
+  jcenter()
+}

buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt

@@ -0,0 +1,45 @@
+package org.ostelco.prime.gradle
+
+object Version {
+  const val assertJ = "3.13.2"
+  const val arrow = "0.8.2"
+  const val beam = "2.15.0"
+  const val csv = "1.7"
+  const val cxf = "3.3.3"
+  const val dockerComposeJunitRule = "1.3.0"
+  const val dropwizard = "1.3.14"
+  const val metrics = "4.1.0"
+  const val firebase = "6.10.0"
+  const val googleCloud = "1.90.0"
+  const val grpc = "1.23.0"
+  const val guava = "28.1-jre"
+  const val jackson = "2.9.9"
+  const val javaxActivation = "1.1.1"
+  const val javaxActivationApi = "1.2.0"
+  const val javaxAnnotation = "1.3.2"
+  // Keeping it version 1.16.1 to be consistent with grpc via PubSub client lib
+  // Keeping it version 1.16.1 to be consistent with netty via Firebase lib
+  const val jaxb = "2.3.1"
+  const val jdbi3 = "3.10.0"
+  const val jjwt = "0.10.7"
+  const val junit5 = "5.5.2"
+  const val kotlin = "1.3.50"
+  const val kotlinXCoroutines = "1.3.1"
+  const val mockito = "3.0.0"
+  const val mockitoKotlin = "2.2.0"
+  const val neo4jDriver = "1.7.5"
+  const val neo4j = "3.5.9"
+  const val opencensus = "0.24.0"
+  const val postgresql = "42.2.8"  // See comment in ./sim-administration/simmanager/build.gradle
+  const val prometheusDropwizard = "2.2.0"
+  const val protoc = "3.9.1"
+  const val slf4j = "1.7.28"
+  // IMPORTANT: When Stripe SDK library version is updated, check if the Stripe API version has changed.
+  // If so, then update API version in Stripe Web Console for callback Webhooks.
+  const val stripe = "12.0.0"
+  const val swagger = "2.0.9"
+  const val swaggerCodegen = "2.4.8"
+  const val testcontainers = "1.12.1"
+  const val tink = "1.2.2"
+  const val zxing = "3.4.0"
+}

customer-endpoint/build.gradle.kts

@@ -1,24 +1,20 @@
+import org.ostelco.prime.gradle.Version
+
 plugins {
   kotlin("jvm")
   `java-library`
 }
 
 dependencies {
-
-  val dropwizardVersion:String by rootProject.extra
-  val mockitoVersion:String by rootProject.extra
-  val assertJVersion:String by rootProject.extra
-  val jjwtVersion:String by rootProject.extra
-
   implementation(project(":prime-modules"))
 
-  testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
-  testImplementation("org.mockito:mockito-core:$mockitoVersion")
-  testImplementation("org.assertj:assertj-core:$assertJVersion")
+  testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
+  testImplementation("org.mockito:mockito-core:${Version.mockito}")
+  testImplementation("org.assertj:assertj-core:${Version.assertJ}")
 
-  testImplementation("io.jsonwebtoken:jjwt-api:$jjwtVersion")
-  testRuntimeOnly("io.jsonwebtoken:jjwt-impl:$jjwtVersion")
-  testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion")
+  testImplementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}")
+  testRuntimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}")
+  testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 
   testImplementation("com.nhaarman:mockito-kotlin:1.6.0")
 }

customer-support-endpoint/build.gradle.kts

@@ -1,16 +1,15 @@
+import org.ostelco.prime.gradle.Version
+
 plugins {
   kotlin("jvm")
   `java-library`
 }
 
 dependencies {
-
-  val dropwizardVersion:String by rootProject.extra
-
   implementation(project(":prime-modules"))
 
   testImplementation(project(":jersey"))
-  testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion")
+  testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
 apply(from = "../gradle/jacoco.gradle")