diff --git a/acceptance-tests/build.gradle.kts b/acceptance-tests/build.gradle.kts index fe3a4f873..b00e986be 100644 --- a/acceptance-tests/build.gradle.kts +++ b/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 { diff --git a/admin-endpoint/build.gradle.kts b/admin-endpoint/build.gradle.kts index b37f707a6..4a13c6d5d 100644 --- a/admin-endpoint/build.gradle.kts +++ b/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") \ No newline at end of file diff --git a/analytics-grpc-api/build.gradle.kts b/analytics-grpc-api/build.gradle.kts index 7fb6e1aaf..c551dc056 100644 --- a/analytics-grpc-api/build.gradle.kts +++ b/analytics-grpc-api/build.gradle.kts @@ -4,6 +4,7 @@ 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` @@ -11,27 +12,23 @@ plugins { 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 { diff --git a/analytics-module/build.gradle.kts b/analytics-module/build.gradle.kts index d17e4f504..764277954 100644 --- a/analytics-module/build.gradle.kts +++ b/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") diff --git a/appleid-auth-service/build.gradle.kts b/appleid-auth-service/build.gradle.kts index be06432f8..768d49edc 100644 --- a/appleid-auth-service/build.gradle.kts +++ b/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 { diff --git a/auth-server/build.gradle.kts b/auth-server/build.gradle.kts index 3b9b28492..7d78b1b55 100644 --- a/auth-server/build.gradle.kts +++ b/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") } diff --git a/build.gradle.kts b/build.gradle.kts index 142cfceae..b9cf382d0 100644 --- a/build.gradle.kts +++ b/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 { kotlinOptions { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 000000000..b71e906cc --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + jcenter() +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt b/buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt new file mode 100644 index 000000000..59bdac471 --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/customer-endpoint/build.gradle.kts b/customer-endpoint/build.gradle.kts index 45c4fbb5e..e67e06a93 100644 --- a/customer-endpoint/build.gradle.kts +++ b/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") } diff --git a/customer-support-endpoint/build.gradle.kts b/customer-support-endpoint/build.gradle.kts index b37f707a6..4a13c6d5d 100644 --- a/customer-support-endpoint/build.gradle.kts +++ b/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") \ No newline at end of file diff --git a/data-store/build.gradle.kts b/data-store/build.gradle.kts index bb4e02ca3..b6c6c1a4c 100644 --- a/data-store/build.gradle.kts +++ b/data-store/build.gradle.kts @@ -1,31 +1,25 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val jacksonVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val dockerComposeJunitRuleVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - api("com.google.cloud:google-cloud-core:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") + api("com.google.cloud:google-cloud-core:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") - testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:$dockerComposeJunitRuleVersion") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/dataflow-pipelines/build.gradle.kts b/dataflow-pipelines/build.gradle.kts index 1569e3908..955b0d0ee 100644 --- a/dataflow-pipelines/build.gradle.kts +++ b/dataflow-pipelines/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -8,28 +9,22 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val beamVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(project(":analytics-grpc-api")) - implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion") + implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}") - implementation("org.apache.beam:beam-sdks-java-core:$beamVersion") - implementation("org.apache.beam:beam-runners-google-cloud-dataflow-java:$beamVersion") + implementation("org.apache.beam:beam-sdks-java-core:${Version.beam}") + implementation("org.apache.beam:beam-runners-google-cloud-dataflow-java:${Version.beam}") implementation("ch.qos.logback:logback-classic:1.2.3") testRuntimeOnly("org.hamcrest:hamcrest-all:1.3") - testRuntimeOnly("org.apache.beam:beam-runners-direct-java:$beamVersion") + testRuntimeOnly("org.apache.beam:beam-runners-direct-java:${Version.beam}") - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") } application { diff --git a/diameter-ha/build.gradle.kts b/diameter-ha/build.gradle.kts index e82d835c2..5c9e26b0e 100644 --- a/diameter-ha/build.gradle.kts +++ b/diameter-ha/build.gradle.kts @@ -1,15 +1,11 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } -version = "1.0.0-SNAPSHOT" - dependencies { - - val kotlinVersion:String by rootProject.extra - val slf4jVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) api("org.mobicents.diameter:jdiameter-api:1.7.1-123") { @@ -20,7 +16,7 @@ dependencies { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j", module = "log4j") } - implementation("org.slf4j:log4j-over-slf4j:$slf4jVersion") + implementation("org.slf4j:log4j-over-slf4j:${Version.slf4j}") compile("io.lettuce:lettuce-core:5.1.8.RELEASE") diff --git a/diameter-stack/build.gradle.kts b/diameter-stack/build.gradle.kts index 6dd73c6fd..97d397e90 100644 --- a/diameter-stack/build.gradle.kts +++ b/diameter-stack/build.gradle.kts @@ -1,13 +1,11 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val slf4jVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect").toString()) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") @@ -25,7 +23,7 @@ dependencies { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j", module = "log4j") } - implementation("org.slf4j:log4j-over-slf4j:$slf4jVersion") + implementation("org.slf4j:log4j-over-slf4j:${Version.slf4j}") testImplementation(kotlin("test-junit")) testRuntimeOnly("org.hamcrest:hamcrest-all:1.3") diff --git a/diameter-test/build.gradle.kts b/diameter-test/build.gradle.kts index fac2ae66a..b1e1f16fc 100644 --- a/diameter-test/build.gradle.kts +++ b/diameter-test/build.gradle.kts @@ -4,9 +4,6 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect").toString()) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") diff --git a/document-data-store/build.gradle.kts b/document-data-store/build.gradle.kts index dc57cc6cc..2d275e1bd 100644 --- a/document-data-store/build.gradle.kts +++ b/document-data-store/build.gradle.kts @@ -4,9 +4,6 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation(project(":data-store")) diff --git a/ekyc/build.gradle.kts b/ekyc/build.gradle.kts index 69853a298..a4cf59eb6 100644 --- a/ekyc/build.gradle.kts +++ b/ekyc/build.gradle.kts @@ -1,4 +1,5 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -6,28 +7,22 @@ plugins { } dependencies { - - val jjwtVersion:String by rootProject.extra - val cxfVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion") - implementation("io.jsonwebtoken:jjwt-impl:$jjwtVersion") - runtimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion") + implementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}") + implementation("io.jsonwebtoken:jjwt-impl:${Version.jjwt}") + runtimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}") - implementation("org.apache.cxf:cxf-rt-rs-security-jose:$cxfVersion") + implementation("org.apache.cxf:cxf-rt-rs-security-jose:${Version.cxf}") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") testImplementation(project(":ext-myinfo-emulator")) - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") } tasks.test { diff --git a/email-notifier/build.gradle.kts b/email-notifier/build.gradle.kts index bb74ce1f2..f42376003 100644 --- a/email-notifier/build.gradle.kts +++ b/email-notifier/build.gradle.kts @@ -1,4 +1,5 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -6,22 +7,17 @@ plugins { } dependencies { - - val dropwizardVersion:String by rootProject.extra - val zxingVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - implementation("com.google.zxing:core:$zxingVersion") - implementation("com.google.zxing:javase:$zxingVersion") + implementation("com.google.zxing:core:${Version.zxing}") + implementation("com.google.zxing:javase:${Version.zxing}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") } tasks.test { diff --git a/ext-auth-provider/build.gradle.kts b/ext-auth-provider/build.gradle.kts index 77890a7bc..383623ea8 100644 --- a/ext-auth-provider/build.gradle.kts +++ b/ext-auth-provider/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,25 +8,18 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val jjwtVersion: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("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}") - 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")) testImplementation(kotlin("test-junit")) } diff --git a/ext-myinfo-emulator/build.gradle.kts b/ext-myinfo-emulator/build.gradle.kts index 18131b49c..84dff7ab6 100644 --- a/ext-myinfo-emulator/build.gradle.kts +++ b/ext-myinfo-emulator/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,29 +8,21 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val jjwtVersion:String by rootProject.extra - val cxfVersion:String by rootProject.extra - val jaxbVersion:String by rootProject.extra - val javaxActivationVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) // This is not a prime-module. Just needed access to getLogger and Dropwizard KotlinModule. implementation(project(":prime-modules")) - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") - implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion") - implementation("io.jsonwebtoken:jjwt-impl:$jjwtVersion") - runtimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion") + implementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}") + implementation("io.jsonwebtoken:jjwt-impl:${Version.jjwt}") + runtimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}") - implementation("org.apache.cxf:cxf-rt-rs-security-jose:$cxfVersion") + implementation("org.apache.cxf:cxf-rt-rs-security-jose:${Version.cxf}") - 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}") } application { diff --git a/firebase-extensions/build.gradle.kts b/firebase-extensions/build.gradle.kts index b4f8fafa5..d5c08d605 100644 --- a/firebase-extensions/build.gradle.kts +++ b/firebase-extensions/build.gradle.kts @@ -1,14 +1,13 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val firebaseVersion:String by rootProject.extra - implementation(project(":prime-modules")) // Match netty via ocs-grpc-api - api("com.google.firebase:firebase-admin:$firebaseVersion") + api("com.google.firebase:firebase-admin:${Version.firebase}") } \ No newline at end of file diff --git a/graphql/build.gradle.kts b/graphql/build.gradle.kts index 9c0423977..5d755f2a4 100644 --- a/graphql/build.gradle.kts +++ b/graphql/build.gradle.kts @@ -1,23 +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 jjwtVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation("com.graphql-java:graphql-java:12.0") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("org.mockito:mockito-core:$mockitoVersion") - testImplementation("io.jsonwebtoken:jjwt-api:$jjwtVersion") - testRuntimeOnly("io.jsonwebtoken:jjwt-impl:$jjwtVersion") - testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("org.mockito:mockito-core:${Version.mockito}") + testImplementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}") + testRuntimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}") + testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/imei-lookup/build.gradle.kts b/imei-lookup/build.gradle.kts index cc9f64307..edfc6e0d8 100644 --- a/imei-lookup/build.gradle.kts +++ b/imei-lookup/build.gradle.kts @@ -1,16 +1,14 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val dropwizardVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - implementation(project(":prime-modules")) - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/jersey/build.gradle.kts b/jersey/build.gradle.kts index 030ca6d35..69d8af8c3 100644 --- a/jersey/build.gradle.kts +++ b/jersey/build.gradle.kts @@ -1,20 +1,18 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val dropwizardVersion:String by rootProject.extra - val jjwtVersion:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("io.jsonwebtoken:jjwt-api:$jjwtVersion") - testRuntimeOnly("io.jsonwebtoken:jjwt-impl:$jjwtVersion") - testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:$jjwtVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}") + testRuntimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}") + testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/kts-engine/build.gradle.kts b/kts-engine/build.gradle.kts index 31f5983a7..09639d177 100644 --- a/kts-engine/build.gradle.kts +++ b/kts-engine/build.gradle.kts @@ -1,14 +1,11 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - api(kotlin("script-util")) api(kotlin("script-runtime")) @@ -19,12 +16,12 @@ dependencies { // api(kotlin("scripting-compiler")) implementation(project(":prime-modules")) - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts index 1d9363620..1e828a19c 100644 --- a/logging/build.gradle.kts +++ b/logging/build.gradle.kts @@ -1,20 +1,17 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-logging:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-logging:${Version.dropwizard}") - implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion") - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-annotations:${Version.jackson}") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 86560fa06..3dd6a06d5 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -1,22 +1,17 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val firebaseVersion:String by rootProject.extra - val slf4jVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) - implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-annotations:${Version.jackson}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") // TODO vihang: this dependency is added only for @Exclude annotation for firebase - implementation("com.google.firebase:firebase-admin:$firebaseVersion") - implementation("org.slf4j:slf4j-api:$slf4jVersion") + implementation("com.google.firebase:firebase-admin:${Version.firebase}") + implementation("org.slf4j:slf4j-api:${Version.slf4j}") } \ No newline at end of file diff --git a/neo4j-store/build.gradle.kts b/neo4j-store/build.gradle.kts index e1141ef03..204f4e6f1 100644 --- a/neo4j-store/build.gradle.kts +++ b/neo4j-store/build.gradle.kts @@ -1,31 +1,25 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val jacksonVersion:String by rootProject.extra - val neo4jVersion:String by rootProject.extra - val neo4jDriverVersion:String by rootProject.extra - val dockerComposeJunitRuleVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - implementation(project(":prime-modules")) api(project(":kts-engine")) - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") - implementation("org.neo4j:neo4j-graphdb-api:$neo4jVersion") - implementation("org.neo4j.driver:neo4j-java-driver:$neo4jDriverVersion") - implementation("org.neo4j:neo4j-slf4j:$neo4jVersion") + implementation("org.neo4j:neo4j-graphdb-api:${Version.neo4j}") + implementation("org.neo4j.driver:neo4j-java-driver:${Version.neo4jDriver}") + implementation("org.neo4j:neo4j-slf4j:${Version.neo4j}") - testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:$dockerComposeJunitRuleVersion") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/ocs-grpc-api/build.gradle.kts b/ocs-grpc-api/build.gradle.kts index 68f8ad45e..d291bfc49 100644 --- a/ocs-grpc-api/build.gradle.kts +++ b/ocs-grpc-api/build.gradle.kts @@ -4,6 +4,7 @@ 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` @@ -11,27 +12,23 @@ plugins { 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 { diff --git a/ocs-ktc/build.gradle.kts b/ocs-ktc/build.gradle.kts index c32632caf..1dbba5763 100644 --- a/ocs-ktc/build.gradle.kts +++ b/ocs-ktc/build.gradle.kts @@ -1,25 +1,21 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val googleCloudVersion:String by rootProject.extra - val dockerComposeJunitRuleVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val mockitoVersion: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}") - testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:$dockerComposeJunitRuleVersion") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } diff --git a/ocsgw/build.gradle.kts b/ocsgw/build.gradle.kts index 009a6c912..671af7038 100644 --- a/ocsgw/build.gradle.kts +++ b/ocsgw/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -8,13 +9,6 @@ plugins { } dependencies { - val kotlinVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val jaxbVersion:String by rootProject.extra - val javaxActivationVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(project(":ocs-grpc-api")) @@ -23,14 +17,14 @@ dependencies { implementation(project(":diameter-stack")) implementation(project(":diameter-ha")) - implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-core-grpc:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-storage:$googleCloudVersion") + implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-core-grpc:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-storage:${Version.googleCloud}") - implementation("javax.xml.bind:jaxb-api:$jaxbVersion") - runtimeOnly("javax.activation:activation:$javaxActivationVersion") + implementation("javax.xml.bind:jaxb-api:${Version.jaxb}") + runtimeOnly("javax.activation:activation:${Version.javaxActivation}") - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") implementation("ch.qos.logback:logback-classic:1.2.3") implementation("ch.qos.logback.contrib:logback-json-classic:0.1.5") implementation("ch.qos.logback.contrib:logback-jackson:0.1.5") @@ -38,11 +32,11 @@ dependencies { compile("com.google.cloud:google-cloud-logging-logback:0.97.0-alpha") testImplementation(project(":diameter-test")) - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") testImplementation("junit:junit:4.12") - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:$junit5Version") + testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${Version.junit5}") } application { diff --git a/payment-processor/build.gradle.kts b/payment-processor/build.gradle.kts index 634725383..2e14162c1 100644 --- a/payment-processor/build.gradle.kts +++ b/payment-processor/build.gradle.kts @@ -1,3 +1,5 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` @@ -5,18 +7,13 @@ plugins { } dependencies { - - val stripeVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation(project(":data-store")) - implementation("com.stripe:stripe-java:$stripeVersion") + implementation("com.stripe:stripe-java:${Version.stripe}") - implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") + implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/prime-customer-api/build.gradle.kts b/prime-customer-api/build.gradle.kts index 696ea5f2e..8ad67239c 100644 --- a/prime-customer-api/build.gradle.kts +++ b/prime-customer-api/build.gradle.kts @@ -1,4 +1,5 @@ import org.hidetake.gradle.swagger.generator.GenerateSwaggerCode +import org.ostelco.prime.gradle.Version plugins { `java-library` @@ -24,13 +25,9 @@ generateSwaggerCode?.also { generatedCode -> } dependencies { + swaggerCodegen("io.swagger:swagger-codegen-cli:${Version.swaggerCodegen}") - val swaggerCodegenVersion:String by rootProject.extra - val javaxAnnotationVersion:String by rootProject.extra - - swaggerCodegen("io.swagger:swagger-codegen-cli:$swaggerCodegenVersion") - - implementation("javax.annotation:javax.annotation-api:$javaxAnnotationVersion") + implementation("javax.annotation:javax.annotation-api:${Version.javaxAnnotation}") // taken from build/swagger-code-java-client/build.gradle implementation("io.swagger:swagger-annotations:1.5.23") diff --git a/prime-modules/build.gradle.kts b/prime-modules/build.gradle.kts index dc8d80300..1b14bc9e6 100644 --- a/prime-modules/build.gradle.kts +++ b/prime-modules/build.gradle.kts @@ -1,42 +1,34 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } 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 jacksonVersion:String by rootProject.extra - val arrowVersion:String by rootProject.extra - val jaxbVersion:String by rootProject.extra - val javaxActivationVersion:String by rootProject.extra - api(kotlin("stdlib-jdk8")) api(kotlin("reflect")) - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinXCoroutinesVersion") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.kotlinXCoroutines}") - api("io.dropwizard:dropwizard-auth:$dropwizardVersion") - implementation("com.google.cloud:google-cloud-pubsub:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") + api("io.dropwizard:dropwizard-auth:${Version.dropwizard}") + implementation("com.google.cloud:google-cloud-pubsub:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") - api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") + api("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") api(project(":ocs-grpc-api")) api(project(":analytics-grpc-api")) api(project(":model")) - api("io.dropwizard:dropwizard-core:$dropwizardVersion") + api("io.dropwizard:dropwizard-core:${Version.dropwizard}") - api("io.arrow-kt:arrow-core:$arrowVersion") - api("io.arrow-kt:arrow-typeclasses:$arrowVersion") - api("io.arrow-kt:arrow-instances-core:$arrowVersion") - api("io.arrow-kt:arrow-effects:$arrowVersion") + api("io.arrow-kt:arrow-core:${Version.arrow}") + api("io.arrow-kt:arrow-typeclasses:${Version.arrow}") + api("io.arrow-kt:arrow-instances-core:${Version.arrow}") + api("io.arrow-kt:arrow-effects:${Version.arrow}") - 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(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/prime/build.gradle.kts b/prime/build.gradle.kts index 1bced2c33..c2a582477 100644 --- a/prime/build.gradle.kts +++ b/prime/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -12,14 +13,6 @@ plugins { version = "1.61.2" dependencies { - - val dropwizardVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val guavaVersion:String by rootProject.extra - val prometheusDropwizardVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - val dockerComposeJunitRuleVersion:String by rootProject.extra - // interface module between prime and prime-modules api(project(":prime-modules")) @@ -47,17 +40,17 @@ dependencies { runtimeOnly(project(":logging")) - implementation("io.dropwizard:dropwizard-http2:$dropwizardVersion") - runtimeOnly("io.dropwizard:dropwizard-json-logging:$dropwizardVersion") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") - implementation("com.google.guava:guava:$guavaVersion") - implementation("org.dhatim:dropwizard-prometheus:$prometheusDropwizardVersion") + implementation("io.dropwizard:dropwizard-http2:${Version.dropwizard}") + runtimeOnly("io.dropwizard:dropwizard-json-logging:${Version.dropwizard}") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") + implementation("com.google.guava:guava:${Version.guava}") + implementation("org.dhatim:dropwizard-prometheus:${Version.prometheusDropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("org.mockito:mockito-core:${Version.mockito}") testImplementation("com.lmax:disruptor:3.4.2") - testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:$dockerComposeJunitRuleVersion") - testImplementation("org.dhatim:dropwizard-prometheus:$prometheusDropwizardVersion") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") + testImplementation("org.dhatim:dropwizard-prometheus:${Version.prometheusDropwizard}") } sourceSets.create("integration") { diff --git a/scaninfo-datastore/build.gradle.kts b/scaninfo-datastore/build.gradle.kts index fd75c2d2f..e7025c071 100644 --- a/scaninfo-datastore/build.gradle.kts +++ b/scaninfo-datastore/build.gradle.kts @@ -1,36 +1,29 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val jacksonVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val tinkVersion:String by rootProject.extra - val dockerComposeJunitRuleVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation(project(":data-store")) - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-storage:$googleCloudVersion") - implementation("com.google.crypto.tink:tink:$tinkVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-storage:${Version.googleCloud}") + implementation("com.google.crypto.tink:tink:${Version.tink}") - testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:$dockerComposeJunitRuleVersion") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) testImplementation(project(":secure-archive")) - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } apply(from = "../gradle/jacoco.gradle") \ No newline at end of file diff --git a/scaninfo-shredder/build.gradle.kts b/scaninfo-shredder/build.gradle.kts index 198641205..3d2f8ba5c 100644 --- a/scaninfo-shredder/build.gradle.kts +++ b/scaninfo-shredder/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") @@ -9,37 +10,28 @@ plugins { version = "1.0.0" dependencies { - - val dropwizardVersion:String by rootProject.extra - val kotlinXCoroutinesVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val arrowVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - api(project(":model")) implementation(project(":data-store")) - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinXCoroutinesVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.kotlinXCoroutines}") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") implementation(kotlin("stdlib-jdk8")) - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") - implementation("io.arrow-kt:arrow-core:$arrowVersion") - implementation("io.arrow-kt:arrow-typeclasses:$arrowVersion") - implementation("io.arrow-kt:arrow-instances-core:$arrowVersion") - implementation("io.arrow-kt:arrow-effects:$arrowVersion") + implementation("io.arrow-kt:arrow-core:${Version.arrow}") + implementation("io.arrow-kt:arrow-typeclasses:${Version.arrow}") + implementation("io.arrow-kt:arrow-instances-core:${Version.arrow}") + implementation("io.arrow-kt:arrow-effects:${Version.arrow}") - runtimeOnly("io.dropwizard:dropwizard-json-logging:$dropwizardVersion") + runtimeOnly("io.dropwizard:dropwizard-json-logging:${Version.dropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("org.mockito:mockito-core:${Version.mockito}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/secure-archive/build.gradle.kts b/secure-archive/build.gradle.kts index a76991771..59ab26908 100644 --- a/secure-archive/build.gradle.kts +++ b/secure-archive/build.gradle.kts @@ -1,24 +1,19 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val jacksonVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val googleCloudVersion:String by rootProject.extra - val tinkVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jackson}") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("com.google.cloud:google-cloud-datastore:$googleCloudVersion") - implementation("com.google.cloud:google-cloud-storage:$googleCloudVersion") - implementation("com.google.crypto.tink:tink:$tinkVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("com.google.cloud:google-cloud-datastore:${Version.googleCloud}") + implementation("com.google.cloud:google-cloud-storage:${Version.googleCloud}") + implementation("com.google.crypto.tink:tink:${Version.tink}") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/sim-administration/es2plus4dropwizard/build.gradle.kts b/sim-administration/es2plus4dropwizard/build.gradle.kts index dca5d780e..5310dbf4e 100644 --- a/sim-administration/es2plus4dropwizard/build.gradle.kts +++ b/sim-administration/es2plus4dropwizard/build.gradle.kts @@ -1,23 +1,20 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val swaggerVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val mockitoVersion:String by rootProject.extra - implementation(project(":sim-administration:jersey-json-schema-validator")) implementation(project(":prime-modules")) - implementation("io.swagger.core.v3:swagger-core:$swaggerVersion") - implementation("io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.swagger.core.v3:swagger-core:${Version.swagger}") + implementation("io.swagger.core.v3:swagger-jaxrs2:${Version.swagger}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("org.mockito:mockito-core:${Version.mockito}") } apply(from = "../../gradle/jacoco.gradle") \ No newline at end of file diff --git a/sim-administration/hss-adapter/build.gradle.kts b/sim-administration/hss-adapter/build.gradle.kts index cdadf986b..f30a8427d 100644 --- a/sim-administration/hss-adapter/build.gradle.kts +++ b/sim-administration/hss-adapter/build.gradle.kts @@ -5,6 +5,7 @@ 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 { kotlin("jvm") @@ -14,50 +15,36 @@ plugins { id("com.google.protobuf") } -val grpcVersion:String by rootProject.extra -val protocVersion:String by rootProject.extra -val javaxAnnotationVersion:String by rootProject.extra - dependencies { - - val arrowVersion:String by rootProject.extra - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val metricsVersion:String by rootProject.extra - val guavaVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val mockitoKotlinVersion:String by rootProject.extra - val testcontainersVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation(project(":sim-administration:simmanager")) - 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("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("javax.annotation:javax.annotation-api:${Version.javaxAnnotation}") - api("io.arrow-kt:arrow-core:$arrowVersion") - api("io.arrow-kt:arrow-typeclasses:$arrowVersion") - api("io.arrow-kt:arrow-instances-core:$arrowVersion") - api("io.arrow-kt:arrow-effects:$arrowVersion") + api("io.arrow-kt:arrow-core:${Version.arrow}") + api("io.arrow-kt:arrow-typeclasses:${Version.arrow}") + api("io.arrow-kt:arrow-instances-core:${Version.arrow}") + api("io.arrow-kt:arrow-effects:${Version.arrow}") implementation(kotlin("reflect")) implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-jdbi3:$dropwizardVersion") - implementation("io.dropwizard.metrics:metrics-core:$metricsVersion") - implementation("com.google.guava:guava:$guavaVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-jdbi3:${Version.dropwizard}") + implementation("io.dropwizard.metrics:metrics-core:${Version.metrics}") + implementation("com.google.guava:guava:${Version.guava}") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:${Version.mockitoKotlin}") - testImplementation("org.testcontainers:postgresql:$testcontainersVersion") + testImplementation("org.testcontainers:postgresql:${Version.testcontainers}") } sourceSets.create("integration") { @@ -97,10 +84,10 @@ tasks.withType { 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 { diff --git a/sim-administration/jersey-json-schema-validator/build.gradle.kts b/sim-administration/jersey-json-schema-validator/build.gradle.kts index 668ac8689..f148894e9 100644 --- a/sim-administration/jersey-json-schema-validator/build.gradle.kts +++ b/sim-administration/jersey-json-schema-validator/build.gradle.kts @@ -1,19 +1,17 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") implementation("com.github.everit-org.json-schema:org.everit.json.schema:1.11.1") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") } apply(from = "../../gradle/jacoco.gradle") \ No newline at end of file diff --git a/sim-administration/ostelco-dropwizard-utils/build.gradle.kts b/sim-administration/ostelco-dropwizard-utils/build.gradle.kts index eadfedf37..747437a94 100644 --- a/sim-administration/ostelco-dropwizard-utils/build.gradle.kts +++ b/sim-administration/ostelco-dropwizard-utils/build.gradle.kts @@ -1,38 +1,32 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val swaggerVersion:String by rootProject.extra - val javaxActivationApiVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val csvVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.swagger.core.v3:swagger-jaxrs2:${Version.swagger}") implementation(kotlin("reflect")) implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-auth:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-jdbi:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-auth:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-jdbi:${Version.dropwizard}") implementation("org.conscrypt:conscrypt-openjdk-uber:2.2.1") - testImplementation("javax.activation:javax.activation-api:$javaxActivationApiVersion") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") - implementation("org.apache.commons:commons-csv:$csvVersion") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("javax.activation:javax.activation-api:${Version.javaxActivationApi}") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") + implementation("org.apache.commons:commons-csv:${Version.csv}") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") } apply(from = "../../gradle/jacoco.gradle") \ No newline at end of file diff --git a/sim-administration/simcard-utils/build.gradle.kts b/sim-administration/simcard-utils/build.gradle.kts index c684aa414..ccc84137f 100644 --- a/sim-administration/simcard-utils/build.gradle.kts +++ b/sim-administration/simcard-utils/build.gradle.kts @@ -1,16 +1,14 @@ +import org.ostelco.prime.gradle.Version + plugins { kotlin("jvm") `java-library` } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") } apply(from = "../../gradle/jacoco.gradle") \ No newline at end of file diff --git a/sim-administration/simmanager/build.gradle.kts b/sim-administration/simmanager/build.gradle.kts index ca5fd5df3..1a82c0b2f 100644 --- a/sim-administration/simmanager/build.gradle.kts +++ b/sim-administration/simmanager/build.gradle.kts @@ -1,10 +1,10 @@ - import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id 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 { kotlin("jvm") @@ -13,23 +13,7 @@ plugins { id("com.google.protobuf") } -val grpcVersion:String by rootProject.extra -val protocVersion:String by rootProject.extra -val javaxAnnotationVersion:String by rootProject.extra - dependencies { - - val arrowVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val metricsVersion:String by rootProject.extra - val guavaVersion:String by rootProject.extra - val csvVersion:String by rootProject.extra - val jdbi3Version:String by rootProject.extra - val postgresqlVersion:String by rootProject.extra - val mockitoKotlinVersion:String by rootProject.extra - val testcontainersVersion:String by rootProject.extra - implementation(project(":prime-modules")) implementation(project(":sim-administration:jersey-json-schema-validator")) @@ -38,33 +22,33 @@ dependencies { implementation(project(":sim-administration:ostelco-dropwizard-utils")) // Arrow - api("io.arrow-kt:arrow-core:$arrowVersion") - api("io.arrow-kt:arrow-typeclasses:$arrowVersion") - api("io.arrow-kt:arrow-instances-core:$arrowVersion") - api("io.arrow-kt:arrow-effects:$arrowVersion") + api("io.arrow-kt:arrow-core:${Version.arrow}") + api("io.arrow-kt:arrow-typeclasses:${Version.arrow}") + api("io.arrow-kt:arrow-instances-core:${Version.arrow}") + api("io.arrow-kt:arrow-effects:${Version.arrow}") // Grpc - 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}") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") // Dropwizard - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-jdbi3:$dropwizardVersion") - implementation("io.dropwizard.metrics:metrics-core:$metricsVersion") - implementation("com.google.guava:guava:$guavaVersion") { + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-jdbi3:${Version.dropwizard}") + implementation("io.dropwizard.metrics:metrics-core:${Version.metrics}") + implementation("com.google.guava:guava:${Version.guava}") { isForce = true } // CSV - implementation("org.apache.commons:commons-csv:$csvVersion") + implementation("org.apache.commons:commons-csv:${Version.csv}") // Jdbi3 // @@ -81,14 +65,14 @@ dependencies { // jdbi3Version = "3.8.2" // postgresqlVersion = "42.2.5" // - implementation("org.jdbi:jdbi3-kotlin:$jdbi3Version") - implementation("org.jdbi:jdbi3-kotlin-sqlobject:$jdbi3Version") - implementation("org.jdbi:jdbi3-postgres:$jdbi3Version") - implementation("org.postgresql:postgresql:$postgresqlVersion") + implementation("org.jdbi:jdbi3-kotlin:${Version.jdbi3}") + implementation("org.jdbi:jdbi3-kotlin-sqlobject:${Version.jdbi3}") + implementation("org.jdbi:jdbi3-postgres:${Version.jdbi3}") + implementation("org.postgresql:postgresql:${Version.postgresql}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") - testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion") - testImplementation("org.testcontainers:postgresql:$testcontainersVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") + testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:${Version.mockitoKotlin}") + testImplementation("org.testcontainers:postgresql:${Version.testcontainers}") testImplementation(project(":sim-administration:sm-dp-plus-emulator")) } @@ -119,10 +103,10 @@ tasks.build.get().dependsOn(integration) 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 { diff --git a/sim-administration/sm-dp-plus-emulator/build.gradle.kts b/sim-administration/sm-dp-plus-emulator/build.gradle.kts index c6db8e1e3..d1c858103 100644 --- a/sim-administration/sm-dp-plus-emulator/build.gradle.kts +++ b/sim-administration/sm-dp-plus-emulator/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,14 +8,6 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val jacksonVersion:String by rootProject.extra - val csvVersion:String by rootProject.extra - val jaxbVersion:String by rootProject.extra - val javaxActivationVersion:String by rootProject.extra - implementation(project(":sim-administration:jersey-json-schema-validator")) implementation(project(":sim-administration:simcard-utils")) implementation(project(":sim-administration:es2plus4dropwizard")) @@ -23,22 +16,22 @@ dependencies { implementation(kotlin("reflect")) implementation(kotlin("stdlib-jdk8")) - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - implementation("io.dropwizard:dropwizard-core:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-auth:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") - implementation("io.dropwizard:dropwizard-jdbi:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-core:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-auth:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") + implementation("io.dropwizard:dropwizard-jdbi:${Version.dropwizard}") implementation("org.conscrypt:conscrypt-openjdk-uber:2.2.1") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") - implementation("org.apache.commons:commons-csv:$csvVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Version.jackson}") + implementation("org.apache.commons:commons-csv:${Version.csv}") - 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}") } application { diff --git a/slack/build.gradle.kts b/slack/build.gradle.kts index 54c890595..95ca400ac 100644 --- a/slack/build.gradle.kts +++ b/slack/build.gradle.kts @@ -1,4 +1,5 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -6,18 +7,14 @@ plugins { } dependencies { - - val dropwizardVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("io.dropwizard:dropwizard-client:$dropwizardVersion") + implementation("io.dropwizard:dropwizard-client:${Version.dropwizard}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") } tasks.test { diff --git a/tools/neo4j-admin-tools/build.gradle.kts b/tools/neo4j-admin-tools/build.gradle.kts index 1c55aa8de..ebc6f516f 100644 --- a/tools/neo4j-admin-tools/build.gradle.kts +++ b/tools/neo4j-admin-tools/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,14 +8,10 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - val neo4jDriverVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(project(":prime-modules")) - implementation("org.neo4j.driver:neo4j-java-driver:$neo4jDriverVersion") + implementation("org.neo4j.driver:neo4j-java-driver:${Version.neo4jDriver}") } diff --git a/tools/prime-admin/build.gradle.kts b/tools/prime-admin/build.gradle.kts index b71b385d4..b9eaced3f 100644 --- a/tools/prime-admin/build.gradle.kts +++ b/tools/prime-admin/build.gradle.kts @@ -7,9 +7,6 @@ plugins { } dependencies { - - val kotlinVersion:String by rootProject.extra - implementation(kotlin("stdlib-jdk8")) implementation(project(":prime")) diff --git a/tracing/build.gradle.kts b/tracing/build.gradle.kts index 6d203d8ee..08471e6b3 100644 --- a/tracing/build.gradle.kts +++ b/tracing/build.gradle.kts @@ -1,4 +1,5 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL +import org.ostelco.prime.gradle.Version plugins { kotlin("jvm") @@ -6,21 +7,16 @@ plugins { } dependencies { - - val opencensusVersion:String by rootProject.extra - val dropwizardVersion:String by rootProject.extra - val junit5Version:String by rootProject.extra - implementation(project(":prime-modules")) - implementation("io.opencensus:opencensus-api:$opencensusVersion") - runtimeOnly("io.opencensus:opencensus-impl:$opencensusVersion") - implementation("io.opencensus:opencensus-exporter-trace-stackdriver:$opencensusVersion") + implementation("io.opencensus:opencensus-api:${Version.opencensus}") + runtimeOnly("io.opencensus:opencensus-impl:${Version.opencensus}") + implementation("io.opencensus:opencensus-exporter-trace-stackdriver:${Version.opencensus}") - testImplementation("io.dropwizard:dropwizard-testing:$dropwizardVersion") + testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}") - testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Version.junit5}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Version.junit5}") } tasks.test {