From 0b7089ace48ede9ffd3a7b24a439321855f7eb9f Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 14:45:58 -0500 Subject: [PATCH 1/7] fix: gradle changes part 2 + identity simplification --- src/common/common/build.gradle | 10 +- .../src/main/kotlin/kiit/common/Identity.kt | 142 +++++++++--------- .../src/main/kotlin/kiit/common/info/About.kt | 2 +- src/common/context/build.gradle | 16 +- .../src/main/kotlin/kiit/context/Context.kt | 4 +- src/common/requests/build.gradle | 18 +-- src/common/result/build.gradle | 6 +- src/common/telemetry/build.gradle | 26 ++-- src/common/utils/build.gradle | 18 +-- src/connectors/connectors-cli/build.gradle | 44 +++--- .../connectors-entities/build.gradle | 40 ++--- src/connectors/connectors-jobs/build.gradle | 52 +++---- src/data/data/build.gradle | 24 +-- src/data/entities/build.gradle | 36 ++--- src/data/migrations/build.gradle | 36 ++--- src/data/query/build.gradle | 16 +- src/infra/cache/build.gradle | 26 ++-- src/infra/comms/build.gradle | 28 ++-- src/infra/core/build.gradle | 22 +-- src/infra/db/build.gradle | 24 +-- src/internal/actors/build.gradle | 6 +- src/internal/http/build.gradle | 18 +-- src/internal/meta/build.gradle | 28 ++-- src/internal/policy/build.gradle | 22 +-- src/internal/serialization/build.gradle | 26 ++-- src/lib/kotlin/kiit/build.gradle | 26 ++-- src/lib/kotlin/slatekit-tests/build.gradle | 40 ++--- .../kotlin/test/cache/Cache_Channel_Tests.kt | 2 +- .../test/kotlin/test/common/IdentityTests.kt | 20 +-- .../kotlin/test/functions/Policy_Tests.kt | 16 +- .../test/kotlin/test/jobs/Job_Create_Tests.kt | 2 +- .../test/kotlin/test/jobs/Job_Manage_Tests.kt | 2 +- .../test/kotlin/test/jobs/Worker_Api_Tests.kt | 4 +- .../kotlin/test/jobs/samples/SampleWorker.kt | 6 +- .../test/kotlin/test/setup/WorkerSimple.kt | 2 +- src/providers/providers-aws/build.gradle | 30 ++-- src/providers/providers-datadog/build.gradle | 26 ++-- src/providers/providers-kafka/build.gradle | 26 ++-- src/providers/providers-logback/build.gradle | 24 +-- src/services/apis/build.gradle | 40 ++--- src/services/app/build.gradle | 26 ++-- src/services/cli/build.gradle | 30 ++-- src/services/jobs/build.gradle | 22 +-- src/services/server/build.gradle | 52 +++---- src/support/generator/build.gradle | 30 ++-- src/support/integration/build.gradle | 78 +++++----- 46 files changed, 595 insertions(+), 599 deletions(-) diff --git a/src/common/common/build.gradle b/src/common/common/build.gradle index 5744a854b..7d910848c 100644 --- a/src/common/common/build.gradle +++ b/src/common/common/build.gradle @@ -55,16 +55,16 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if (kiitSetupViaBinary) { - compile "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" } else { // */ - compile project(":kiit-result") + implementation project(":kiit-result") } // } diff --git a/src/common/common/src/main/kotlin/kiit/common/Identity.kt b/src/common/common/src/main/kotlin/kiit/common/Identity.kt index 6ae53df67..290696ea3 100644 --- a/src/common/common/src/main/kotlin/kiit/common/Identity.kt +++ b/src/common/common/src/main/kotlin/kiit/common/Identity.kt @@ -1,61 +1,18 @@ package kiit.common import kiit.common.envs.EnvMode +import kiit.common.ext.toIdent import kiit.common.ids.ULIDs /** - * Used to identity services / components - * form = area.service.agent.env.instance - * name = signup.alerts.job.qat - * full = signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3 - */ -interface Identity { - - val id: String - val name: String - val fullname: String - val idWithTags: String - - val area: String - val service: String - val agent: Agent - val env: String - val version: String - val desc: String - val instance: String - val tags: List - - fun newInstance(): Identity - fun with(inst: String? = null, tags: List): Identity - - companion object { - - val empty = SimpleIdentity("empty", "empty", Agent.Test, "empty") - - fun app(area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { - return SimpleIdentity(area, service, Agent.App, env.name) - } - - fun api(area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { - return SimpleIdentity(area, service, Agent.API, env.name) - } - - fun cli(area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { - return SimpleIdentity(area, service, Agent.CLI, env.name) - } - - fun job(area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { - return SimpleIdentity(area, service, Agent.Job, env.name) - } - - fun test(name: String): Identity { - return SimpleIdentity("tests", name, Agent.Test, EnvMode.Dev.name) - } - } -} - -/** - * Simple Identity used to identity services / components + * Identity used to identity services / components + * + * form = company.area.service.agent.env.version.instance + * name = app1.accounts.signup.alerts.job.qat + * vers = app1.accounts.signup.alerts.job.qat.1_0_2_3 + * full = app1.accounts.signup.alerts.job.qat.1_0_2_3.4a3b300b-d0ac-4776-8a9c-31aa75e412b3 + * + * @param company : app1 | jetbrains - company name/origin * @param area : area | dept | org - logical group * @param service : user1 | job | svc - to distinguish multiple agents/users * @param agent : api | app | job - environment @@ -66,48 +23,85 @@ interface Identity { * name = signup.alerts.job.qat * full = signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3 */ -data class SimpleIdentity( - override val area: String, - override val service: String, - override val agent: Agent, - override val env: String, - override val instance: String = ULIDs.create().value, - override val version: String = "LATEST", - override val desc: String = "", - override val tags: List = listOf() -) : Identity { +data class Identity( + val company: String, + val area: String, + val service: String, + val agent: Agent, + val env: String, + val instance: String = ULIDs.create().value, + val version: String = "LATEST", + val desc: String = "", + val tags: List = listOf() +) { private val tagged = tags.joinToString() /** * Enforced naming convention for an application's name ( simple name ) - * {AREA}.{SERVICE} - * @sample: signup.alerts + * {COMPANY}.{AREA}.{SERVICE}.{AGENT} + * @sample: app1.signup.alerts.job */ - override val name = "$area.$service" + val name = "$company.$area.$service.${agent.name}" /** * Enforced naming convention for application's full name with agent and env - * {AREA}.{SERVICE}.{AGENT}.{ENV} - * signup.alerts.job.qat + * {COMPANY}.{AREA}.{SERVICE}.{AGENT}.{ENV}.{VERSION} + * app1.signup.alerts.job.qat. */ - override val fullname: String = - "$name.${agent.name.lowercase()}.${env.lowercase()}.${version.replace(".", "_")}" + val full: String = + "$name.${env.lowercase()}.${version.replace(".", "_")}" /** * The id contains the instance name - * @sample: signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3 + * @sample: app1.signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3 * */ - override val id: String = "$fullname.$instance" + val id: String = "$full.$instance" /** * The id contains the instance name * @sample: signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3.a1,b2,c3 * */ - override val idWithTags: String = "$fullname.$instance" + if (tagged.isNullOrEmpty()) "" else ".$tagged" + val idWithTags: String = "$full.$instance" + if (tagged.isEmpty()) "" else ".$tagged" - override fun newInstance(): Identity = this.copy(instance = ULIDs.create().value) - override fun with(inst: String?, tags: List): Identity = + fun newInstance(): Identity = this.copy(instance = ULIDs.create().value) + + fun with(inst: String?, tags: List): Identity = this.copy(instance = inst ?: ULIDs.create().value, tags = tags) + + + companion object { + + val empty = Identity("", "empty", "empty", Agent.Test, "empty") + + fun app(company:String, area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { + return of(company, area, service, Agent.App, env) + } + + fun api(company:String, area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { + return of(company, area, service, Agent.API, env) + } + + fun cli(company:String, area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { + return of(company, area, service, Agent.CLI, env) + } + + fun job(company:String, area: String, service: String, env: EnvMode = EnvMode.Dev): Identity { + return of(company, area, service, Agent.Job, env) + } + + fun test(company:String, name: String): Identity { + return of(company, "tests", name, Agent.Test, EnvMode.Dev) + } + + fun of(company:String, area: String, service: String, agent:Agent, env: EnvMode = EnvMode.Dev): Identity { + return Identity( + company.toIdent(), + area.toIdent(), + service.toIdent(), + agent, + env.name) + } + } } diff --git a/src/common/common/src/main/kotlin/kiit/common/info/About.kt b/src/common/common/src/main/kotlin/kiit/common/info/About.kt index 41d1ff43d..4f6e1ea8c 100644 --- a/src/common/common/src/main/kotlin/kiit/common/info/About.kt +++ b/src/common/common/src/main/kotlin/kiit/common/info/About.kt @@ -92,7 +92,7 @@ data class About( fun dir(): String = company.orElse(name).replace(" ", "-") - fun toId(): Identity = SimpleIdentity(area, name, Agent.App, EnvMode.Dev.name) + fun toId(): Identity = Identity.of(company, area, name, Agent.App, EnvMode.Dev) companion object { @JvmStatic diff --git a/src/common/context/build.gradle b/src/common/context/build.gradle index d0efb8f91..d0e39cf54 100644 --- a/src/common/context/build.gradle +++ b/src/common/context/build.gradle @@ -53,19 +53,19 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if (kiitSetupViaBinary) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/common/context/src/main/kotlin/kiit/context/Context.kt b/src/common/context/src/main/kotlin/kiit/context/Context.kt index a0a94d7f6..e63aa242d 100644 --- a/src/common/context/src/main/kotlin/kiit/context/Context.kt +++ b/src/common/context/src/main/kotlin/kiit/context/Context.kt @@ -2,7 +2,6 @@ package kiit.context import kiit.common.Agent import kiit.common.Identity -import kiit.common.SimpleIdentity import kiit.common.args.Args import kiit.common.conf.Conf import kiit.common.crypto.Encryptor @@ -34,7 +33,8 @@ interface Context { companion object { fun identity(info: Info, envs: Envs): Identity { - return SimpleIdentity( + return kiit.common.Identity.of( + info.about.company, info.about.area, info.about.name, Agent.App, diff --git a/src/common/requests/build.gradle b/src/common/requests/build.gradle index ee13ecfc9..0b7424152 100644 --- a/src/common/requests/build.gradle +++ b/src/common/requests/build.gradle @@ -53,20 +53,20 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/common/result/build.gradle b/src/common/result/build.gradle index b37d1dad3..ce208eb4a 100644 --- a/src/common/result/build.gradle +++ b/src/common/result/build.gradle @@ -51,9 +51,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testCompile 'junit:junit:4.12' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + testImplementation 'junit:junit:4.12' } // ================================================================== diff --git a/src/common/telemetry/build.gradle b/src/common/telemetry/build.gradle index ad781beb7..d894412c6 100644 --- a/src/common/telemetry/build.gradle +++ b/src/common/telemetry/build.gradle @@ -52,24 +52,24 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-requests") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-requests") } // } diff --git a/src/common/utils/build.gradle b/src/common/utils/build.gradle index 1456dd588..16dc3a430 100644 --- a/src/common/utils/build.gradle +++ b/src/common/utils/build.gradle @@ -53,20 +53,20 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/connectors/connectors-cli/build.gradle b/src/connectors/connectors-cli/build.gradle index acd98fa68..c01bb0afe 100644 --- a/src/connectors/connectors-cli/build.gradle +++ b/src/connectors/connectors-cli/build.gradle @@ -54,35 +54,35 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - //compile group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' - compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' - compile group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' - compile group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' + //implementation group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' + implementation group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' + implementation group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-apis:$kiit_version" - compile "dev.kiit:kiit-cli:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-apis:$kiit_version" + implementation "dev.kiit:kiit-cli:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-context") - compile project(":kiit-utils") - compile project(":kiit-requests") - compile project(":kiit-apis") - compile project(":kiit-cli") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-context") + implementation project(":kiit-utils") + implementation project(":kiit-requests") + implementation project(":kiit-apis") + implementation project(":kiit-cli") } // } diff --git a/src/connectors/connectors-entities/build.gradle b/src/connectors/connectors-entities/build.gradle index 7506f7bbb..cb397bd20 100644 --- a/src/connectors/connectors-entities/build.gradle +++ b/src/connectors/connectors-entities/build.gradle @@ -54,33 +54,33 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - //compile group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' - compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' - compile group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' - compile group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' + //implementation group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' + implementation group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' + implementation group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-db:$kiit_version" - compile "dev.kiit:kiit-entities:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-db:$kiit_version" + implementation "dev.kiit:kiit-entities:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-context") - compile project(":kiit-utils") - compile project(":kiit-db") - compile project(":kiit-entities") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-context") + implementation project(":kiit-utils") + implementation project(":kiit-db") + implementation project(":kiit-entities") } // } diff --git a/src/connectors/connectors-jobs/build.gradle b/src/connectors/connectors-jobs/build.gradle index b7c673bb3..32fdc624b 100644 --- a/src/connectors/connectors-jobs/build.gradle +++ b/src/connectors/connectors-jobs/build.gradle @@ -54,39 +54,39 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - //compile group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' - compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' - compile group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' - compile group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' + //implementation group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' + implementation group: 'ch.qos.logback', name: 'logback-core' , version: '1.1.2' + implementation group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.2' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-actors:$kiit_version" - compile "dev.kiit:kiit-core:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-apis:$kiit_version" - compile "dev.kiit:kiit-jobs:$kiit_version" - compile "dev.kiit:kiit-connectors-entities:$kiit_version" - compile "dev.kiit:kiit-providers-aws:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-actors:$kiit_version" + implementation "dev.kiit:kiit-core:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-apis:$kiit_version" + implementation "dev.kiit:kiit-jobs:$kiit_version" + implementation "dev.kiit:kiit-connectors-entities:$kiit_version" + implementation "dev.kiit:kiit-providers-aws:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-actors") - compile project(":kiit-core") - compile project(":kiit-context") - compile project(":kiit-apis") - compile project(":kiit-jobs") - compile project(":connectors-entities") - compile project(":providers-aws") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-actors") + implementation project(":kiit-core") + implementation project(":kiit-context") + implementation project(":kiit-apis") + implementation project(":kiit-jobs") + implementation project(":connectors-entities") + implementation project(":providers-aws") } // } diff --git a/src/data/data/build.gradle b/src/data/data/build.gradle index 8c0b4a99a..9798374f4 100644 --- a/src/data/data/build.gradle +++ b/src/data/data/build.gradle @@ -52,23 +52,23 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-meta:$kiit_version" - compile "dev.kiit:kiit-query:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-query:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-meta") - compile project(":kiit-query") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-meta") + implementation project(":kiit-query") } // } diff --git a/src/data/entities/build.gradle b/src/data/entities/build.gradle index de585b56c..5fabcfb0d 100644 --- a/src/data/entities/build.gradle +++ b/src/data/entities/build.gradle @@ -52,29 +52,29 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-query:$kiit_version" - compile "dev.kiit:kiit-meta:$kiit_version" - compile "dev.kiit:kiit-data:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-query:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-data:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-context") - compile project(":kiit-data") - compile project(":kiit-query") - compile project(":kiit-meta") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-context") + implementation project(":kiit-data") + implementation project(":kiit-query") + implementation project(":kiit-meta") } // } diff --git a/src/data/migrations/build.gradle b/src/data/migrations/build.gradle index b11a7bc10..91cbce34d 100644 --- a/src/data/migrations/build.gradle +++ b/src/data/migrations/build.gradle @@ -52,29 +52,29 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile fileTree(dir: 'lib', include: '*.jar') - compile "com.amazonaws:aws-java-sdk-core:1.11.100" - compile "com.amazonaws:aws-java-sdk-s3:1.11.100" - compile "com.amazonaws:aws-java-sdk-sqs:1.11.100" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation fileTree(dir: 'lib', include: '*.jar') + implementation "com.amazonaws:aws-java-sdk-core:1.11.100" + implementation "com.amazonaws:aws-java-sdk-s3:1.11.100" + implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-data:$kiit_version" - compile "dev.kiit:kiit-entities:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-data:$kiit_version" + implementation "dev.kiit:kiit-entities:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-data") - compile project(":kiit-entities") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-data") + implementation project(":kiit-entities") } // } diff --git a/src/data/query/build.gradle b/src/data/query/build.gradle index 6edb5fdbf..b47cf620e 100644 --- a/src/data/query/build.gradle +++ b/src/data/query/build.gradle @@ -52,19 +52,19 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/infra/cache/build.gradle b/src/infra/cache/build.gradle index b7a0657d8..101c8fe18 100644 --- a/src/infra/cache/build.gradle +++ b/src/infra/cache/build.gradle @@ -52,24 +52,24 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-core:$kiit_version" - compile "dev.kiit:kiit-telemetry:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-core:$kiit_version" + implementation "dev.kiit:kiit-telemetry:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-core") - compile project(":kiit-telemetry") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-core") + implementation project(":kiit-telemetry") } // } diff --git a/src/infra/comms/build.gradle b/src/infra/comms/build.gradle index f0e81d033..a7543f64b 100644 --- a/src/infra/comms/build.gradle +++ b/src/infra/comms/build.gradle @@ -52,25 +52,25 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile "com.googlecode.json-simple:json-simple:1.1" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-http:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-http:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-http") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-http") } // } diff --git a/src/infra/core/build.gradle b/src/infra/core/build.gradle index d38486852..2e2ae3a62 100644 --- a/src/infra/core/build.gradle +++ b/src/infra/core/build.gradle @@ -52,22 +52,22 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") } // } diff --git a/src/infra/db/build.gradle b/src/infra/db/build.gradle index 13a91a998..3d3b6f7bd 100644 --- a/src/infra/db/build.gradle +++ b/src/infra/db/build.gradle @@ -52,23 +52,23 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile fileTree(dir: 'lib', include: '*.jar') - compile "com.amazonaws:aws-java-sdk-core:1.11.100" - compile "com.amazonaws:aws-java-sdk-s3:1.11.100" - compile "com.amazonaws:aws-java-sdk-sqs:1.11.100" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation fileTree(dir: 'lib', include: '*.jar') + implementation "com.amazonaws:aws-java-sdk-core:1.11.100" + implementation "com.amazonaws:aws-java-sdk-s3:1.11.100" + implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/internal/actors/build.gradle b/src/internal/actors/build.gradle index fba881de5..2f52ec3f9 100644 --- a/src/internal/actors/build.gradle +++ b/src/internal/actors/build.gradle @@ -51,9 +51,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' } // ================================================================== diff --git a/src/internal/http/build.gradle b/src/internal/http/build.gradle index 03b5c5131..72f32db66 100644 --- a/src/internal/http/build.gradle +++ b/src/internal/http/build.gradle @@ -53,20 +53,20 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/internal/meta/build.gradle b/src/internal/meta/build.gradle index b99258f94..eb7b4162b 100644 --- a/src/internal/meta/build.gradle +++ b/src/internal/meta/build.gradle @@ -52,25 +52,25 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.googlecode.json-simple:json-simple:1.1" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-requests") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-requests") } // } diff --git a/src/internal/policy/build.gradle b/src/internal/policy/build.gradle index 41b60d93e..eaa538cf0 100644 --- a/src/internal/policy/build.gradle +++ b/src/internal/policy/build.gradle @@ -52,22 +52,22 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-telemetry:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-telemetry:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-telemetry") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-telemetry") } // } diff --git a/src/internal/serialization/build.gradle b/src/internal/serialization/build.gradle index 9d673acab..8b45833e8 100644 --- a/src/internal/serialization/build.gradle +++ b/src/internal/serialization/build.gradle @@ -52,24 +52,24 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.googlecode.json-simple:json-simple:1.1" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-requests") - compile project(":kiit-meta") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-requests") + implementation project(":kiit-meta") } // } diff --git a/src/lib/kotlin/kiit/build.gradle b/src/lib/kotlin/kiit/build.gradle index 7cf87d286..8e52d0abb 100644 --- a/src/lib/kotlin/kiit/build.gradle +++ b/src/lib/kotlin/kiit/build.gradle @@ -58,13 +58,13 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' -// compile "mysql:mysql-connector-java:5.1.13" -// compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' +// implementation "mysql:mysql-connector-java:5.1.13" +// implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { @@ -184,13 +184,13 @@ sourceSets { // manifest { // attributes( // 'Main-Class': 'kiit.RunKt', -// "Class-Path": configurations.compile.collect { it.getName() }.join(' ') +// "Class-Path": configurations.implementation.collect { it.getName() }.join(' ') // ) // } //} -task copyAllJars(type: Copy) { - dependsOn build - into "lib" - from configurations.runtime -} \ No newline at end of file +//task copyAllJars(type: Copy) { +// dependsOn build +// into "lib" +// from configurations.runtime +//} \ No newline at end of file diff --git a/src/lib/kotlin/slatekit-tests/build.gradle b/src/lib/kotlin/slatekit-tests/build.gradle index da7c71efd..81795ef02 100644 --- a/src/lib/kotlin/slatekit-tests/build.gradle +++ b/src/lib/kotlin/slatekit-tests/build.gradle @@ -45,22 +45,22 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile "mysql:mysql-connector-java:5.1.13" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "mysql:mysql-connector-java:5.1.13" // https://mvnrepository.com/artifact/com.h2database/h2 - testCompile group: 'com.h2database', name: 'h2' , version: '1.4.200' - testCompile group: 'org.xerial' , name:'sqlite-jdbc', version:'3.8.11.2' - //compile "com.h2database:h2:1.4.200" - compile 'org.koin:koin-core:2.0.0-rc-2' - compile "org.json:json:20201115" - //compile group: 'org.json', name: 'json', version: '20201115' + testImplementation group: 'com.h2database', name: 'h2' , version: '1.4.200' + testImplementation group: 'org.xerial' , name:'sqlite-jdbc', version:'3.8.11.2' + //implementation "com.h2database:h2:1.4.200" + implementation 'org.koin:koin-core:2.0.0-rc-2' + implementation "org.json:json:20201115" + //implementation group: 'org.json', name: 'json', version: '20201115' - //compile "postgresql:postgresql:42.1.1" - compile "postgresql:postgresql:9.1-901-1.jdbc4" - compile 'org.threeten:threetenbp:1.3.8' + //implementation "postgresql:postgresql:42.1.1" + implementation "postgresql:postgresql:9.1-901-1.jdbc4" + implementation 'org.threeten:threetenbp:1.3.8' implementation project(":kiit-result") implementation project(":kiit-actors") implementation project(":kiit-common") @@ -88,12 +88,12 @@ dependencies { implementation project(":providers-logback") implementation project(":providers-datadog") - compile 'io.micrometer:micrometer-registry-datadog:latest.release' + implementation 'io.micrometer:micrometer-registry-datadog:latest.release' - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' //testRuntime "org.junit.platform:junit-platform-runner" - testCompile "org.jetbrains.kotlin:kotlin-test" - testCompile "org.jetbrains.kotlin:kotlin-test-junit" - testCompile 'org.jetbrains.spek:spek-api:1.1.1' - testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.1' + testImplementation "org.jetbrains.kotlin:kotlin-test" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit" + testImplementation 'org.jetbrains.spek:spek-api:1.1.1' + testImplementation 'org.jetbrains.spek:spek-junit-platform-engine:1.1.1' } diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt index b14468bda..6632b4a41 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt @@ -22,7 +22,7 @@ import kiit.common.log.LoggerConsole class Cache_Channel_Tests { val CACHE_NAME = "unit-tests-cache" - val id = Identity.app("app", "cache") + val id = Identity.app("kiit", "app", "cache") fun getCache(initialize: Boolean = true, settings: CacheSettings = CacheSettings(10), listener: ((CacheEvent) -> Unit)? = null): SimpleAsyncCache { val cache = SimpleAsyncCache.of(id, LoggerConsole(), settings, listener) return cache diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt index 59176672f..718c324a8 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt @@ -25,38 +25,40 @@ import kiit.common.ids.ULIDs class IdentityTests { @Test fun can_build_via_helper() { - val id1 = Identity.app("signup", "alerts", EnvMode.Qat) + val id1 = Identity.app("app 1", "signup", "alerts", EnvMode.Qat) + Assert.assertEquals( "app_1", id1.company ) Assert.assertEquals( "signup", id1.area ) Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "LATEST", id1.version ) - Assert.assertEquals( "signup.alerts", id1.name ) - Assert.assertEquals( "signup.alerts.app.qat.LATEST", id1.fullname ) + Assert.assertEquals( "app_12.signup.alerts", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app.qat.LATEST", id1.full ) } @Test fun can_create_manually() { - val id1 = SimpleIdentity("signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2") + val id1 = Identity("app 1", "signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2") + Assert.assertEquals( "app_1", id1.area ) Assert.assertEquals( "signup", id1.area ) Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "1.2", id1.version ) - Assert.assertEquals( "signup.alerts", id1.name ) - Assert.assertEquals( "signup.alerts.app.qat.1_2", id1.fullname ) + Assert.assertEquals( "app_1.signup.alerts", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app.qat.1_2", id1.full ) } @Test fun can_create_with_id() { val id = ULIDs.create() - val id1 = SimpleIdentity("signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2", instance= id.value) + val id1 = Identity("app_1","signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2", instance= id.value) Assert.assertEquals( "signup", id1.area ) Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "1.2", id1.version ) - Assert.assertEquals( "signup.alerts", id1.name ) - Assert.assertEquals( "signup.alerts.app.qat.1_2.${id.value}", id1.id ) + Assert.assertEquals( "app_1.signup.alerts", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app.qat.1_2.${id.value}", id1.id ) } } \ No newline at end of file diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/functions/Policy_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/functions/Policy_Tests.kt index 6db059245..ffb2e6d7c 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/functions/Policy_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/functions/Policy_Tests.kt @@ -18,7 +18,7 @@ class Policy_Tests { @Test fun test_limit_success(){ - val counters = Counters(Identity.test("policy")) + val counters = Counters(Identity.test("kiit", "policy")) val policy: Policy = Limit(2, true, { counters } ) val result = runBlocking { policy.run("1") { @@ -33,7 +33,7 @@ class Policy_Tests { @Test fun test_limit_failure(){ - val counters = Counters(Identity.test("policy")) + val counters = Counters(Identity.test("kiit", "policy")) val policy: Policy = Limit(2, true, { counters } ) val result = runBlocking { policy.run("1") { Outcomes.of(it.toInt()) } @@ -48,7 +48,7 @@ class Policy_Tests { @Test fun test_calls_success(){ - val calls = Calls(Identity.test("policy")) + val calls = Calls(Identity.test("kiit", "policy")) val policy: Policy = Calls(2, { calls } ) val result = runBlocking { policy.run("1") { @@ -64,7 +64,7 @@ class Policy_Tests { @Test fun test_calls_failure(){ - val calls = Calls(Identity.test("policy")) + val calls = Calls(Identity.test("kiit", "policy")) val policy: Policy = Calls(2, { calls } ) val result = runBlocking { policy.run("1") { calls.inc(); Outcomes.of(it.toInt()) } @@ -111,7 +111,7 @@ class Policy_Tests { @Test fun test_ratio_success(){ - val counts = Counters(Identity.test("policy")) + val counts = Counters(Identity.test("kiit", "policy")) val policy: Policy = Ratio(.4, Failed.Denied(Codes.DENIED.name, 0, ""), { counts }) val result = runBlocking { policy.run("1") { counts.processed.inc(); counts.succeeded.inc(); Outcomes.of(it.toInt()) } @@ -126,7 +126,7 @@ class Policy_Tests { @Test fun test_ratio_failure(){ - val counts = Counters(Identity.test("policy")) + val counts = Counters(Identity.test("kiit", "policy")) val policy: Policy = Ratio(.5, Failed.Denied(Codes.DENIED.name, 0, ""), { counts }) val result = runBlocking { policy.run("1") { counts.processed.inc(); counts.succeeded.inc(); Outcomes.of(it.toInt()) } @@ -141,7 +141,7 @@ class Policy_Tests { @Test fun test_compose() { - val id = Identity.test("policy") + val id = Identity.test("kiit", "policy") val calls = Calls(id) val counts = Counters(id) val p1 = Limit(4, true, { i -> counts }) @@ -161,7 +161,7 @@ class Policy_Tests { @Test fun test_chaining() { - val id = Identity.test("policy") + val id = Identity.test("kiit", "policy") val calls = Calls(id) val counts = Counters(id) var everyValue = 0 diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt index a88886ca0..fc55d339b 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt @@ -13,7 +13,7 @@ import test.jobs.support.JobTestSupport class Job_Create_Tests : JobTestSupport { - private val ID = Identity.job("tests", "job") + private val ID = Identity.job("kiit", "tests", "job") @Test diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Manage_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Manage_Tests.kt index 3536794b8..dbfbd7806 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Manage_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Manage_Tests.kt @@ -9,7 +9,7 @@ import test.jobs.support.JobTestSupport class Job_Manage_Tests : JobTestSupport { - private val ID = Identity.job("tests", "job") + private val ID = Identity.job("kiit", "tests", "job") @Test diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Worker_Api_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Worker_Api_Tests.kt index 300710793..d0d6c0658 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Worker_Api_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Worker_Api_Tests.kt @@ -77,7 +77,7 @@ class Worker_Api_Tests : TestSupport { fun can_run_from_queue() { val container = buildContainer() val queues = listOf(InMemoryQueue.stringQueue()) - val worker = JobAPIWorker(container, Identity.test("api-worker")) + val worker = JobAPIWorker(container, Identity.test("kiit", "api-worker")) val sampleDate = DateTime.of(2018, 1, 27, 9, 30, 45, 0, ZoneId.of("UTC")) val sampleRequest = CommonRequest( path = "samples.types2.loadBasicTypes", @@ -106,7 +106,7 @@ class Worker_Api_Tests : TestSupport { val entry = queue.next()!! val queueInfo = JobQueue("tests", Priority.Mid, WrappedAsyncQueue(queue)) - val job = JobQueue.task(Identity.test("samples"), entry, queueInfo) + val job = JobQueue.task(Identity.test("kiit", "samples"), entry, queueInfo) val result = runBlocking { worker.work(job) } diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/samples/SampleWorker.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/samples/SampleWorker.kt index f5a9cfc6a..61c6cea26 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/samples/SampleWorker.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/samples/SampleWorker.kt @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger class OneTimeWorker(val start:Int, val end:Int, id: Identity) : Worker(id) { - constructor(start:Int, end:Int):this(start, end, Identity.test(OneTimeWorker::class.simpleName!!)) + constructor(start:Int, end:Int):this(start, end, Identity.test("kiit", OneTimeWorker::class.simpleName!!)) private val current = AtomicInteger(start) @@ -62,7 +62,7 @@ class OneTimeWorker(val start:Int, val end:Int, id: Identity) : Worker(id) class PagedWorker(start:Int, val maxRuns:Int, val countsPerRun:Int, id: Identity? = null) - : Worker( id ?: Identity.test(PagedWorker::class.simpleName!!)) { + : Worker( id ?: Identity.test("kiit", PagedWorker::class.simpleName!!)) { private val runs = AtomicInteger(0) private val counts = AtomicInteger(start) @@ -100,7 +100,7 @@ class PagedWorker(start:Int, val maxRuns:Int, val countsPerRun:Int, id: Identity class TestWorker(id: Identity? = null, val limit:Int = 10) - : Worker( id ?: Identity.test(TestWorker::class.simpleName!!)) { + : Worker( id ?: Identity.test("kiit", TestWorker::class.simpleName!!)) { val counts = AtomicInteger(0) val cycles = mutableMapOf() diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/setup/WorkerSimple.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/setup/WorkerSimple.kt index 18d2c0f88..4b2ab5188 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/setup/WorkerSimple.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/setup/WorkerSimple.kt @@ -8,7 +8,7 @@ import kiit.jobs.Worker class MyWorker( var acc: Int = 0 ) : Worker( - Identity.test("myworker")) { + Identity.test("kiit", "myworker")) { var isInitialized = false var isEnded = false diff --git a/src/providers/providers-aws/build.gradle b/src/providers/providers-aws/build.gradle index 645d23681..dad16b8f6 100644 --- a/src/providers/providers-aws/build.gradle +++ b/src/providers/providers-aws/build.gradle @@ -53,26 +53,26 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.amazonaws:aws-java-sdk-core:1.11.100" - compile "com.amazonaws:aws-java-sdk-s3:1.11.100" - compile "com.amazonaws:aws-java-sdk-sqs:1.11.100" - compile "com.amazonaws:aws-java-sdk-dynamodb:1.11.100" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "com.amazonaws:aws-java-sdk-core:1.11.100" + implementation "com.amazonaws:aws-java-sdk-s3:1.11.100" + implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" + implementation "com.amazonaws:aws-java-sdk-dynamodb:1.11.100" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-core:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-core:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-core") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-core") } // } diff --git a/src/providers/providers-datadog/build.gradle b/src/providers/providers-datadog/build.gradle index 6df3d96aa..85e138940 100644 --- a/src/providers/providers-datadog/build.gradle +++ b/src/providers/providers-datadog/build.gradle @@ -54,28 +54,28 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - //compile group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' + //implementation group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' // https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core - //compile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.0' - compile 'io.micrometer:micrometer-registry-datadog:latest.release' + //implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.0' + implementation 'io.micrometer:micrometer-registry-datadog:latest.release' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-telemetry:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-telemetry:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-telemetry") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-telemetry") } // } diff --git a/src/providers/providers-kafka/build.gradle b/src/providers/providers-kafka/build.gradle index e235935f9..e99c5a86d 100644 --- a/src/providers/providers-kafka/build.gradle +++ b/src/providers/providers-kafka/build.gradle @@ -54,25 +54,25 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0' + implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'org.threeten:threetenbp:1.3.8' - compile 'org.apache.kafka:kafka-clients:2.4.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'org.threeten:threetenbp:1.3.8' + implementation 'org.apache.kafka:kafka-clients:2.4.0' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-core:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-core:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-core") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-core") } // } diff --git a/src/providers/providers-logback/build.gradle b/src/providers/providers-logback/build.gradle index a7bb82e9c..5b337ecd0 100644 --- a/src/providers/providers-logback/build.gradle +++ b/src/providers/providers-logback/build.gradle @@ -54,25 +54,25 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - //compile group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' - compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - compile group: 'ch.qos.logback', name: 'logback-core' , version: '1.2.3' - compile group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.5' + //implementation group: 'org.slf4j' , name: 'slf4j-api', version: '1.7.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' + implementation group: 'ch.qos.logback', name: 'logback-core' , version: '1.2.3' + implementation group: 'org.logback-extensions', name: 'logback-ext-loggly' , version: '0.1.5' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") + implementation project(":kiit-result") + implementation project(":kiit-common") } // } diff --git a/src/services/apis/build.gradle b/src/services/apis/build.gradle index 22a06adb4..811e04b5a 100644 --- a/src/services/apis/build.gradle +++ b/src/services/apis/build.gradle @@ -52,31 +52,31 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.googlecode.json-simple:json-simple:1.1" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-meta:$kiit_version" - compile "dev.kiit:kiit-serialization:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-serialization:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-requests") - compile project(":kiit-context") - compile project(":kiit-meta") - compile project(":kiit-serialization") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-requests") + implementation project(":kiit-context") + implementation project(":kiit-meta") + implementation project(":kiit-serialization") } // } diff --git a/src/services/app/build.gradle b/src/services/app/build.gradle index f3b347ac6..1bd61b2e7 100644 --- a/src/services/app/build.gradle +++ b/src/services/app/build.gradle @@ -52,24 +52,24 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-context") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-context") } // } diff --git a/src/services/cli/build.gradle b/src/services/cli/build.gradle index 5496cce44..44a47e23d 100644 --- a/src/services/cli/build.gradle +++ b/src/services/cli/build.gradle @@ -52,26 +52,26 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-requests") - compile project(":kiit-context") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-requests") + implementation project(":kiit-context") } // } diff --git a/src/services/jobs/build.gradle b/src/services/jobs/build.gradle index 6618506a2..2d7a7282b 100644 --- a/src/services/jobs/build.gradle +++ b/src/services/jobs/build.gradle @@ -52,22 +52,22 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-actors:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-actors:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-actors") - compile project(":kiit-common") - compile project(":kiit-utils") + implementation project(":kiit-result") + implementation project(":kiit-actors") + implementation project(":kiit-common") + implementation project(":kiit-utils") } // } diff --git a/src/services/server/build.gradle b/src/services/server/build.gradle index 7c6009caa..b6122d5f9 100644 --- a/src/services/server/build.gradle +++ b/src/services/server/build.gradle @@ -59,39 +59,39 @@ kotlin { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "io.ktor:ktor-server-netty:$ktor_version" - compile "io.ktor:ktor-metrics:$ktor_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "io.ktor:ktor-server-netty:$ktor_version" + implementation "io.ktor:ktor-metrics:$ktor_version" - compile "org.json:json:20201115" - compile "com.googlecode.json-simple:json-simple:1.1" - //compile 'com.sparkjava:spark-core:2.6.0' - compile 'org.threeten:threetenbp:1.3.8' - compile fileTree(dir: 'lib', include: '*.jar') + implementation "org.json:json:20201115" + implementation "com.googlecode.json-simple:json-simple:1.1" + //implementation 'com.sparkjava:spark-core:2.6.0' + implementation 'org.threeten:threetenbp:1.3.8' + implementation fileTree(dir: 'lib', include: '*.jar') // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-telemetry:$kiit_version" - compile "dev.kiit:kiit-apis:$kiit_version" - compile "dev.kiit:kiit-serialization:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-telemetry:$kiit_version" + implementation "dev.kiit:kiit-apis:$kiit_version" + implementation "dev.kiit:kiit-serialization:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-requests") - compile project(":kiit-context") - compile project(":kiit-telemetry") - compile project(":kiit-apis") - compile project(":kiit-serialization") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-requests") + implementation project(":kiit-context") + implementation project(":kiit-telemetry") + implementation project(":kiit-apis") + implementation project(":kiit-serialization") } // } diff --git a/src/support/generator/build.gradle b/src/support/generator/build.gradle index 42d76b141..86ab137b3 100644 --- a/src/support/generator/build.gradle +++ b/src/support/generator/build.gradle @@ -52,26 +52,26 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-utils:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-apis:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-apis:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-utils") - compile project(":kiit-context") - compile project(":kiit-apis") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-utils") + implementation project(":kiit-context") + implementation project(":kiit-apis") } // } diff --git a/src/support/integration/build.gradle b/src/support/integration/build.gradle index 5bf596b1f..e1236046c 100644 --- a/src/support/integration/build.gradle +++ b/src/support/integration/build.gradle @@ -52,50 +52,50 @@ repositories { ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' - compile "com.googlecode.json-simple:json-simple:1.1" - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'org.threeten:threetenbp:1.3.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'org.threeten:threetenbp:1.3.8' // /* if( kiitSetupViaBinary ) { - compile "dev.kiit:kiit-results:$kiit_version" - compile "dev.kiit:kiit-common:$kiit_version" - compile "dev.kiit:kiit-context:$kiit_version" - compile "dev.kiit:kiit-requests:$kiit_version" - compile "dev.kiit:kiit-meta:$kiit_version" - compile "dev.kiit:kiit-query:$kiit_version" - compile "dev.kiit:kiit-cli:$kiit_version" - compile "dev.kiit:kiit-entities:$kiit_version" - compile "dev.kiit:kiit-core:$kiit_version" - compile "dev.kiit:kiit-comms:$kiit_version" - compile "dev.kiit:kiit-cache:$kiit_version" - compile "dev.kiit:kiit-apis:$kiit_version" - compile "dev.kiit:kiit-jobs:$kiit_version" - compile "dev.kiit:kiit-policy:$kiit_version" - compile "dev.kiit:kiit-migrations:$kiit_version" - compile "dev.kiit:kiit-connectors-entities:$kiit_version" + implementation "dev.kiit:kiit-results:$kiit_version" + implementation "dev.kiit:kiit-common:$kiit_version" + implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-query:$kiit_version" + implementation "dev.kiit:kiit-cli:$kiit_version" + implementation "dev.kiit:kiit-entities:$kiit_version" + implementation "dev.kiit:kiit-core:$kiit_version" + implementation "dev.kiit:kiit-comms:$kiit_version" + implementation "dev.kiit:kiit-cache:$kiit_version" + implementation "dev.kiit:kiit-apis:$kiit_version" + implementation "dev.kiit:kiit-jobs:$kiit_version" + implementation "dev.kiit:kiit-policy:$kiit_version" + implementation "dev.kiit:kiit-migrations:$kiit_version" + implementation "dev.kiit:kiit-connectors-entities:$kiit_version" } else { // */ - compile project(":kiit-result") - compile project(":kiit-common") - compile project(":kiit-context") - compile project(":kiit-requests") - compile project(":kiit-meta") - compile project(":kiit-query") - compile project(":kiit-cli") - compile project(":kiit-entities") - compile project(":kiit-core") - compile project(":kiit-policy") - compile project(":kiit-cache") - compile project(":kiit-apis") - compile project(":kiit-jobs") - compile project(":kiit-migrations") - compile project(":kiit-comms") - compile project(":connectors-entities") + implementation project(":kiit-result") + implementation project(":kiit-common") + implementation project(":kiit-context") + implementation project(":kiit-requests") + implementation project(":kiit-meta") + implementation project(":kiit-query") + implementation project(":kiit-cli") + implementation project(":kiit-entities") + implementation project(":kiit-core") + implementation project(":kiit-policy") + implementation project(":kiit-cache") + implementation project(":kiit-apis") + implementation project(":kiit-jobs") + implementation project(":kiit-migrations") + implementation project(":kiit-comms") + implementation project(":connectors-entities") } // } From 072df25d63727b3897d49b6dedf4c243aa4266fc Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:07:12 -0500 Subject: [PATCH 2/7] fix : references to sub projects --- src/common/common/build.gradle | 4 ++-- src/common/common/src/main/kotlin/kiit/common/Identity.kt | 7 +++++-- src/common/context/build.gradle | 4 ++-- src/common/context/src/main/kotlin/kiit/context/Context.kt | 4 ++-- src/common/requests/build.gradle | 5 +++-- src/common/telemetry/build.gradle | 4 ++-- src/common/utils/build.gradle | 4 ++-- src/connectors/connectors-cli/build.gradle | 4 ++-- src/connectors/connectors-entities/build.gradle | 4 ++-- src/connectors/connectors-jobs/build.gradle | 6 ++++-- src/data/data/build.gradle | 4 ++-- src/data/entities/build.gradle | 5 +++-- src/data/migrations/build.gradle | 6 ++++-- src/data/query/build.gradle | 4 ++-- src/infra/cache/build.gradle | 4 ++-- src/infra/cache/src/main/kotlin/kiit/cache/SimpleCache.kt | 2 +- src/infra/comms/build.gradle | 4 ++-- src/infra/core/build.gradle | 4 ++-- src/infra/db/build.gradle | 4 ++-- src/internal/http/build.gradle | 4 ++-- src/internal/meta/build.gradle | 4 ++-- src/internal/policy/build.gradle | 4 ++-- src/internal/serialization/build.gradle | 6 ++++-- src/lib/kotlin/kiit/build.gradle | 4 ++-- src/lib/kotlin/slatekit-tests/build.gradle | 4 ++++ src/providers/providers-aws/build.gradle | 4 ++-- src/providers/providers-datadog/build.gradle | 4 ++-- src/providers/providers-kafka/build.gradle | 4 ++-- src/providers/providers-logback/build.gradle | 4 ++-- src/services/apis/build.gradle | 4 ++-- src/services/app/build.gradle | 4 ++-- src/services/cli/build.gradle | 4 ++-- src/services/jobs/build.gradle | 5 +++-- src/services/jobs/src/main/kotlin/kiit/jobs/Worker.kt | 2 +- src/services/server/build.gradle | 4 ++-- src/support/generator/build.gradle | 4 ++-- src/support/integration/build.gradle | 4 ++-- 37 files changed, 86 insertions(+), 70 deletions(-) diff --git a/src/common/common/build.gradle b/src/common/common/build.gradle index 7d910848c..491e95e0b 100644 --- a/src/common/common/build.gradle +++ b/src/common/common/build.gradle @@ -59,13 +59,13 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if (kiitSetupViaBinary) { implementation "dev.kiit:kiit-results:$kiit_version" } else { // */ implementation project(":kiit-result") - } // + // } // } // ================================================================== diff --git a/src/common/common/src/main/kotlin/kiit/common/Identity.kt b/src/common/common/src/main/kotlin/kiit/common/Identity.kt index 290696ea3..cb0f2b3d0 100644 --- a/src/common/common/src/main/kotlin/kiit/common/Identity.kt +++ b/src/common/common/src/main/kotlin/kiit/common/Identity.kt @@ -3,6 +3,7 @@ package kiit.common import kiit.common.envs.EnvMode import kiit.common.ext.toIdent import kiit.common.ids.ULIDs +import java.util.* /** * Identity used to identity services / components @@ -95,13 +96,15 @@ data class Identity( return of(company, "tests", name, Agent.Test, EnvMode.Dev) } - fun of(company:String, area: String, service: String, agent:Agent, env: EnvMode = EnvMode.Dev): Identity { + fun of(company:String, area: String, service: String, agent:Agent, env: EnvMode = EnvMode.Dev, version: String? = null, desc:String? = null): Identity { return Identity( company.toIdent(), area.toIdent(), service.toIdent(), agent, - env.name) + env.name.lowercase(Locale.getDefault()), + version = version ?: "LATEST", + desc = desc ?: "") } } } diff --git a/src/common/context/build.gradle b/src/common/context/build.gradle index d0e39cf54..361490de4 100644 --- a/src/common/context/build.gradle +++ b/src/common/context/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if (kiitSetupViaBinary) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -66,7 +66,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // ================================================================== diff --git a/src/common/context/src/main/kotlin/kiit/context/Context.kt b/src/common/context/src/main/kotlin/kiit/context/Context.kt index e63aa242d..ed689d33a 100644 --- a/src/common/context/src/main/kotlin/kiit/context/Context.kt +++ b/src/common/context/src/main/kotlin/kiit/context/Context.kt @@ -33,12 +33,12 @@ interface Context { companion object { fun identity(info: Info, envs: Envs): Identity { - return kiit.common.Identity.of( + return Identity.of( info.about.company, info.about.area, info.about.name, Agent.App, - envs.name, + envs.current.mode, version = info.build.version, desc = info.about.desc ) diff --git a/src/common/requests/build.gradle b/src/common/requests/build.gradle index 0b7424152..002c81a29 100644 --- a/src/common/requests/build.gradle +++ b/src/common/requests/build.gradle @@ -56,10 +56,11 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "com.googlecode.json-simple:json-simple:1.1" implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -67,7 +68,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // ================================================================== diff --git a/src/common/telemetry/build.gradle b/src/common/telemetry/build.gradle index d894412c6..01e3b8454 100644 --- a/src/common/telemetry/build.gradle +++ b/src/common/telemetry/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-requests") - } // + // } // } // ================================================================== diff --git a/src/common/utils/build.gradle b/src/common/utils/build.gradle index 16dc3a430..ed5ffcfe4 100644 --- a/src/common/utils/build.gradle +++ b/src/common/utils/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -67,7 +67,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // ================================================================== diff --git a/src/connectors/connectors-cli/build.gradle b/src/connectors/connectors-cli/build.gradle index c01bb0afe..2571c9a2a 100644 --- a/src/connectors/connectors-cli/build.gradle +++ b/src/connectors/connectors-cli/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -83,7 +83,7 @@ dependencies { implementation project(":kiit-requests") implementation project(":kiit-apis") implementation project(":kiit-cli") - } // + // } // } // ================================================================== diff --git a/src/connectors/connectors-entities/build.gradle b/src/connectors/connectors-entities/build.gradle index cb397bd20..6e226d3d5 100644 --- a/src/connectors/connectors-entities/build.gradle +++ b/src/connectors/connectors-entities/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -81,7 +81,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-db") implementation project(":kiit-entities") - } // + // } // } // ================================================================== diff --git a/src/connectors/connectors-jobs/build.gradle b/src/connectors/connectors-jobs/build.gradle index 32fdc624b..98177e86e 100644 --- a/src/connectors/connectors-jobs/build.gradle +++ b/src/connectors/connectors-jobs/build.gradle @@ -65,13 +65,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" implementation "dev.kiit:kiit-actors:$kiit_version" implementation "dev.kiit:kiit-core:$kiit_version" implementation "dev.kiit:kiit-context:$kiit_version" + implementation "dev.kiit:kiit-requests:$kiit_version" implementation "dev.kiit:kiit-apis:$kiit_version" implementation "dev.kiit:kiit-jobs:$kiit_version" implementation "dev.kiit:kiit-connectors-entities:$kiit_version" @@ -83,11 +84,12 @@ dependencies { implementation project(":kiit-actors") implementation project(":kiit-core") implementation project(":kiit-context") + implementation project(":kiit-requests") implementation project(":kiit-apis") implementation project(":kiit-jobs") implementation project(":connectors-entities") implementation project(":providers-aws") - } // + // } // } // ================================================================== diff --git a/src/data/data/build.gradle b/src/data/data/build.gradle index 9798374f4..609aea475 100644 --- a/src/data/data/build.gradle +++ b/src/data/data/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -69,7 +69,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-meta") implementation project(":kiit-query") - } // + // } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/entities/build.gradle b/src/data/entities/build.gradle index 5fabcfb0d..8c0189583 100644 --- a/src/data/entities/build.gradle +++ b/src/data/entities/build.gradle @@ -54,10 +54,11 @@ ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -75,7 +76,7 @@ dependencies { implementation project(":kiit-data") implementation project(":kiit-query") implementation project(":kiit-meta") - } // + // } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/migrations/build.gradle b/src/data/migrations/build.gradle index 91cbce34d..298071d5d 100644 --- a/src/data/migrations/build.gradle +++ b/src/data/migrations/build.gradle @@ -61,13 +61,14 @@ dependencies { implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" implementation "dev.kiit:kiit-utils:$kiit_version" implementation "dev.kiit:kiit-data:$kiit_version" implementation "dev.kiit:kiit-entities:$kiit_version" + implementation "dev.kiit:kiit-meta:$kiit_version" } else { // */ implementation project(":kiit-result") @@ -75,7 +76,8 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-data") implementation project(":kiit-entities") - } // + implementation project(":kiit-meta") + // } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/query/build.gradle b/src/data/query/build.gradle index b47cf620e..9fb2b43ea 100644 --- a/src/data/query/build.gradle +++ b/src/data/query/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -65,7 +65,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/infra/cache/build.gradle b/src/infra/cache/build.gradle index 101c8fe18..fda7e5ac5 100644 --- a/src/infra/cache/build.gradle +++ b/src/infra/cache/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-core") implementation project(":kiit-telemetry") - } // + // } // } // ================================================================== diff --git a/src/infra/cache/src/main/kotlin/kiit/cache/SimpleCache.kt b/src/infra/cache/src/main/kotlin/kiit/cache/SimpleCache.kt index 38b018c41..2b41f5bf3 100644 --- a/src/infra/cache/src/main/kotlin/kiit/cache/SimpleCache.kt +++ b/src/infra/cache/src/main/kotlin/kiit/cache/SimpleCache.kt @@ -32,7 +32,7 @@ import kiit.telemetry.Tracker * * @param settings */ -open class SimpleCache(override val id:Identity = Identity.app("app", "cache"), +open class SimpleCache(override val id:Identity = Identity.api("kiit", "infra", "cache"), override val settings: CacheSettings, override val listener:((CacheEvent) -> Unit)? = null, override val logger: Logger? = null ) : Cache { diff --git a/src/infra/comms/build.gradle b/src/infra/comms/build.gradle index a7543f64b..d3a622a92 100644 --- a/src/infra/comms/build.gradle +++ b/src/infra/comms/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -71,7 +71,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-http") - } // + // } // } // ================================================================== diff --git a/src/infra/core/build.gradle b/src/infra/core/build.gradle index 2e2ae3a62..3827a3145 100644 --- a/src/infra/core/build.gradle +++ b/src/infra/core/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -68,7 +68,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-utils") - } // + // } // } // ================================================================== diff --git a/src/infra/db/build.gradle b/src/infra/db/build.gradle index 3d3b6f7bd..6bc36f2d0 100644 --- a/src/infra/db/build.gradle +++ b/src/infra/db/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -69,7 +69,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/internal/http/build.gradle b/src/internal/http/build.gradle index 72f32db66..8f2710526 100644 --- a/src/internal/http/build.gradle +++ b/src/internal/http/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -67,7 +67,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // ================================================================== diff --git a/src/internal/meta/build.gradle b/src/internal/meta/build.gradle index eb7b4162b..ba9cc024a 100644 --- a/src/internal/meta/build.gradle +++ b/src/internal/meta/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -71,7 +71,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-requests") - } // + // } // } // ================================================================== diff --git a/src/internal/policy/build.gradle b/src/internal/policy/build.gradle index eaa538cf0..9eeed3380 100644 --- a/src/internal/policy/build.gradle +++ b/src/internal/policy/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -68,7 +68,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-telemetry") - } // + // } // } // ================================================================== diff --git a/src/internal/serialization/build.gradle b/src/internal/serialization/build.gradle index 8b45833e8..e7eddb0c5 100644 --- a/src/internal/serialization/build.gradle +++ b/src/internal/serialization/build.gradle @@ -58,19 +58,21 @@ dependencies { implementation "com.googlecode.json-simple:json-simple:1.1" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" implementation "dev.kiit:kiit-requests:$kiit_version" implementation "dev.kiit:kiit-meta:$kiit_version" + implementation "dev.kiit:kiit-utils:$kiit_version" } else { // */ implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-requests") implementation project(":kiit-meta") - } // + implementation project(":kiit-utils") + // } // } // ================================================================== diff --git a/src/lib/kotlin/kiit/build.gradle b/src/lib/kotlin/kiit/build.gradle index 8e52d0abb..842372736 100644 --- a/src/lib/kotlin/kiit/build.gradle +++ b/src/lib/kotlin/kiit/build.gradle @@ -66,7 +66,7 @@ dependencies { // implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:results:$kiit_version" implementation "dev.kiit:common:$kiit_version" @@ -131,7 +131,7 @@ dependencies { // implementation project(":kiit-integration") implementation project(":kiit-server") // implementation project(":slatekit-samples") - } // + // } // // implementation project(":slatekit-examples") // implementation project(":slatekit-samples") implementation project(":kiit-tests") diff --git a/src/lib/kotlin/slatekit-tests/build.gradle b/src/lib/kotlin/slatekit-tests/build.gradle index 81795ef02..5bb4a2494 100644 --- a/src/lib/kotlin/slatekit-tests/build.gradle +++ b/src/lib/kotlin/slatekit-tests/build.gradle @@ -49,6 +49,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation "com.googlecode.json-simple:json-simple:1.1" implementation "mysql:mysql-connector-java:5.1.13" // https://mvnrepository.com/artifact/com.h2database/h2 testImplementation group: 'com.h2database', name: 'h2' , version: '1.4.200' @@ -65,6 +66,7 @@ dependencies { implementation project(":kiit-actors") implementation project(":kiit-common") implementation project(":kiit-utils") + implementation project(":kiit-data") implementation project(":kiit-requests") implementation project(":kiit-context") implementation project(":kiit-app") @@ -74,11 +76,13 @@ dependencies { implementation project(":kiit-db") implementation project(":kiit-query") implementation project(":kiit-meta") + implementation project(":kiit-comms") implementation project(":kiit-entities") implementation project(":kiit-http") implementation project(":kiit-jobs") implementation project(":kiit-apis") implementation project(":kiit-telemetry") + implementation project(":kiit-serialization") implementation project(":kiit-policy") implementation project(":kiit-integration") implementation project(":connectors-cli") diff --git a/src/providers/providers-aws/build.gradle b/src/providers/providers-aws/build.gradle index dad16b8f6..aa5bfc0f4 100644 --- a/src/providers/providers-aws/build.gradle +++ b/src/providers/providers-aws/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-core") - } // + // } // } // ================================================================== diff --git a/src/providers/providers-datadog/build.gradle b/src/providers/providers-datadog/build.gradle index 85e138940..3b88d219f 100644 --- a/src/providers/providers-datadog/build.gradle +++ b/src/providers/providers-datadog/build.gradle @@ -66,7 +66,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -76,7 +76,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-telemetry") - } // + // } // } // ================================================================== diff --git a/src/providers/providers-kafka/build.gradle b/src/providers/providers-kafka/build.gradle index e99c5a86d..66cec8f09 100644 --- a/src/providers/providers-kafka/build.gradle +++ b/src/providers/providers-kafka/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'org.threeten:threetenbp:1.3.8' implementation 'org.apache.kafka:kafka-clients:2.4.0' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-core") - } // + // } // } // ================================================================== diff --git a/src/providers/providers-logback/build.gradle b/src/providers/providers-logback/build.gradle index 5b337ecd0..1c363c806 100644 --- a/src/providers/providers-logback/build.gradle +++ b/src/providers/providers-logback/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - } // + // } // } // ================================================================== diff --git a/src/services/apis/build.gradle b/src/services/apis/build.gradle index 811e04b5a..64f6930bd 100644 --- a/src/services/apis/build.gradle +++ b/src/services/apis/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -77,7 +77,7 @@ dependencies { implementation project(":kiit-context") implementation project(":kiit-meta") implementation project(":kiit-serialization") - } // + // } // } // ================================================================== diff --git a/src/services/app/build.gradle b/src/services/app/build.gradle index 1bd61b2e7..2476e166f 100644 --- a/src/services/app/build.gradle +++ b/src/services/app/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-context") - } // + // } // } // ================================================================== diff --git a/src/services/cli/build.gradle b/src/services/cli/build.gradle index 44a47e23d..aa3f42839 100644 --- a/src/services/cli/build.gradle +++ b/src/services/cli/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -72,7 +72,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-requests") implementation project(":kiit-context") - } // + // } // } // ================================================================== diff --git a/src/services/jobs/build.gradle b/src/services/jobs/build.gradle index 2d7a7282b..469d56348 100644 --- a/src/services/jobs/build.gradle +++ b/src/services/jobs/build.gradle @@ -55,8 +55,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' + implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-actors:$kiit_version" @@ -68,7 +69,7 @@ dependencies { implementation project(":kiit-actors") implementation project(":kiit-common") implementation project(":kiit-utils") - } // + // } // } // ================================================================== diff --git a/src/services/jobs/src/main/kotlin/kiit/jobs/Worker.kt b/src/services/jobs/src/main/kotlin/kiit/jobs/Worker.kt index c8e8672c2..b58c7dc39 100644 --- a/src/services/jobs/src/main/kotlin/kiit/jobs/Worker.kt +++ b/src/services/jobs/src/main/kotlin/kiit/jobs/Worker.kt @@ -19,7 +19,7 @@ import kiit.actors.pause.Check * 2. Clients should only extend worker to use/enrich the life-cycle, state change, alerting, diagnostic methods above */ open class Worker(id: Identity) : Check, Cycle { - val id = if (id.tags.isEmpty() || !id.tags.contains("worker")) id.with(tags = listOf("worker")) else id + val id = if (id.tags.isEmpty() || !id.tags.contains("worker")) id.with(null, tags = listOf("worker")) else id protected val _status = AtomicReference>(Pair(Status.InActive, Status.InActive.name)) diff --git a/src/services/server/build.gradle b/src/services/server/build.gradle index b6122d5f9..7bc3bc649 100644 --- a/src/services/server/build.gradle +++ b/src/services/server/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation 'org.threeten:threetenbp:1.3.8' implementation fileTree(dir: 'lib', include: '*.jar') - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -92,7 +92,7 @@ dependencies { implementation project(":kiit-telemetry") implementation project(":kiit-apis") implementation project(":kiit-serialization") - } // + // } // } // ================================================================== diff --git a/src/support/generator/build.gradle b/src/support/generator/build.gradle index 86ab137b3..88d5b93c4 100644 --- a/src/support/generator/build.gradle +++ b/src/support/generator/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -72,7 +72,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-context") implementation project(":kiit-apis") - } // + // } // } // ================================================================== diff --git a/src/support/integration/build.gradle b/src/support/integration/build.gradle index e1236046c..570845329 100644 --- a/src/support/integration/build.gradle +++ b/src/support/integration/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - // /* + /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -96,7 +96,7 @@ dependencies { implementation project(":kiit-migrations") implementation project(":kiit-comms") implementation project(":connectors-entities") - } // + // } // } // ================================================================== From e7338f8e1338834b4a7f41bbbb7144639e285fc9 Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:16:31 -0500 Subject: [PATCH 3/7] fix: compile issues after changes --- .../src/main/kotlin/kiit/common/Identity.kt | 6 +++--- src/lib/kotlin/slatekit-tests/build.gradle | 2 ++ .../src/test/kotlin/test/common/IdentityTests.kt | 15 +++++++-------- .../src/test/kotlin/test/jobs/Job_Create_Tests.kt | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/common/common/src/main/kotlin/kiit/common/Identity.kt b/src/common/common/src/main/kotlin/kiit/common/Identity.kt index cb0f2b3d0..9487415d3 100644 --- a/src/common/common/src/main/kotlin/kiit/common/Identity.kt +++ b/src/common/common/src/main/kotlin/kiit/common/Identity.kt @@ -31,7 +31,7 @@ data class Identity( val agent: Agent, val env: String, val instance: String = ULIDs.create().value, - val version: String = "LATEST", + val version: String = "latest", val desc: String = "", val tags: List = listOf() ) { @@ -42,7 +42,7 @@ data class Identity( * {COMPANY}.{AREA}.{SERVICE}.{AGENT} * @sample: app1.signup.alerts.job */ - val name = "$company.$area.$service.${agent.name}" + val name = "$company.$area.$service.${agent.name.lowercase(Locale.getDefault())}" /** * Enforced naming convention for application's full name with agent and env @@ -103,7 +103,7 @@ data class Identity( service.toIdent(), agent, env.name.lowercase(Locale.getDefault()), - version = version ?: "LATEST", + version = version ?: "latest", desc = desc ?: "") } } diff --git a/src/lib/kotlin/slatekit-tests/build.gradle b/src/lib/kotlin/slatekit-tests/build.gradle index 5bb4a2494..cdfb5b694 100644 --- a/src/lib/kotlin/slatekit-tests/build.gradle +++ b/src/lib/kotlin/slatekit-tests/build.gradle @@ -50,6 +50,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' implementation "com.googlecode.json-simple:json-simple:1.1" + implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation "mysql:mysql-connector-java:5.1.13" // https://mvnrepository.com/artifact/com.h2database/h2 testImplementation group: 'com.h2database', name: 'h2' , version: '1.4.200' @@ -85,6 +86,7 @@ dependencies { implementation project(":kiit-serialization") implementation project(":kiit-policy") implementation project(":kiit-integration") + implementation project(":kiit-migrations") implementation project(":connectors-cli") implementation project(":connectors-entities") implementation project(":connectors-jobs") diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt index 718c324a8..20796ee47 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt @@ -18,7 +18,6 @@ import kiit.common.envs.* import org.junit.Test import kiit.common.Agent import kiit.common.Identity -import kiit.common.SimpleIdentity import kiit.common.ids.ULIDs @@ -31,15 +30,15 @@ class IdentityTests { Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) - Assert.assertEquals( "LATEST", id1.version ) - Assert.assertEquals( "app_12.signup.alerts", id1.name ) - Assert.assertEquals( "app_1.signup.alerts.app.qat.LATEST", id1.full ) + Assert.assertEquals( "latest", id1.version ) + Assert.assertEquals( "app_12.signup.alerts.app", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app.qat.latest", id1.full ) } @Test fun can_create_manually() { - val id1 = Identity("app 1", "signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2") - Assert.assertEquals( "app_1", id1.area ) + val id1 = Identity.of("app 1", "signup", "alerts", Agent.App, EnvMode.Qat, version = "1.2") + Assert.assertEquals( "app_1", id1.company ) Assert.assertEquals( "signup", id1.area ) Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) @@ -52,13 +51,13 @@ class IdentityTests { @Test fun can_create_with_id() { val id = ULIDs.create() - val id1 = Identity("app_1","signup", "alerts", Agent.App, EnvMode.Qat.name, version = "1.2", instance= id.value) + val id1 = Identity.of("app_1","signup", "alerts", Agent.App, EnvMode.Qat, version = "1.2", instance= id.value) Assert.assertEquals( "signup", id1.area ) Assert.assertEquals( "alerts", id1.service ) Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "1.2", id1.version ) - Assert.assertEquals( "app_1.signup.alerts", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app", id1.name ) Assert.assertEquals( "app_1.signup.alerts.app.qat.1_2.${id.value}", id1.id ) } } \ No newline at end of file diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt index fc55d339b..87749473d 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt @@ -24,7 +24,7 @@ class Job_Create_Tests : JobTestSupport { Assert.assertEquals(wrk.worker, mgr.get(0)?.worker) Assert.assertEquals(wrk.worker, mgr.get(wrk.id)?.worker) - Assert.assertEquals(wrk.worker, mgr.get("tests.job.${wrk.id.instance}")?.worker) + Assert.assertEquals(wrk.worker, mgr.get("kiit.tests.job.Job.${wrk.id.instance}")?.worker) } From 435c2e5e178134310fe69847aebf9e2515c63a67 Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:17:51 -0500 Subject: [PATCH 4/7] Update Identity.kt --- src/common/common/src/main/kotlin/kiit/common/Identity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/common/src/main/kotlin/kiit/common/Identity.kt b/src/common/common/src/main/kotlin/kiit/common/Identity.kt index 9487415d3..b653a7d54 100644 --- a/src/common/common/src/main/kotlin/kiit/common/Identity.kt +++ b/src/common/common/src/main/kotlin/kiit/common/Identity.kt @@ -96,13 +96,14 @@ data class Identity( return of(company, "tests", name, Agent.Test, EnvMode.Dev) } - fun of(company:String, area: String, service: String, agent:Agent, env: EnvMode = EnvMode.Dev, version: String? = null, desc:String? = null): Identity { + fun of(company:String, area: String, service: String, agent:Agent, env: EnvMode = EnvMode.Dev, version: String? = null, desc:String? = null, instance:String? = null): Identity { return Identity( company.toIdent(), area.toIdent(), service.toIdent(), agent, env.name.lowercase(Locale.getDefault()), + instance = instance ?: ULIDs.create().value, version = version ?: "latest", desc = desc ?: "") } From d0979c6d693a17d45d7f9209ae254015d896c056 Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:20:08 -0500 Subject: [PATCH 5/7] fix: unit-tests --- .../src/test/kotlin/test/cache/Cache_Channel_Tests.kt | 6 +++--- .../src/test/kotlin/test/common/IdentityTests.kt | 4 ++-- .../src/test/kotlin/test/jobs/Job_Create_Tests.kt | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt index 6632b4a41..753361c0d 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/cache/Cache_Channel_Tests.kt @@ -101,7 +101,7 @@ class Cache_Channel_Tests { Assert.assertEquals(CacheAction.Create, event?.action) Assert.assertEquals("countries", event?.key) Assert.assertTrue(!event?.uuid.isNullOrEmpty()) - Assert.assertEquals("app.cache.${CacheAction.Create.name}.countries", event?.name ?: "") + Assert.assertEquals("kiit.app.cache.app.${CacheAction.Create.name}.countries", event?.name ?: "") } } @@ -195,7 +195,7 @@ class Cache_Channel_Tests { Assert.assertEquals(CacheAction.DeleteAll, event?.action) Assert.assertEquals("*", event?.key) Assert.assertTrue(!event?.uuid.isNullOrEmpty()) - Assert.assertEquals("app.cache.${CacheAction.DeleteAll.name}.*", event?.name ?: "") + Assert.assertEquals("kiit.app.cache.app.${CacheAction.DeleteAll.name}.*", event?.name ?: "") } } @@ -360,7 +360,7 @@ class Cache_Channel_Tests { Assert.assertEquals(CacheAction.Expire, event?.action) Assert.assertEquals("countries", event?.key) Assert.assertTrue(!event?.uuid.isNullOrEmpty()) - Assert.assertEquals("app.cache.${CacheAction.Expire.name}.countries", event?.name ?: "") + Assert.assertEquals("kiit.app.cache.app.${CacheAction.Expire.name}.countries", event?.name ?: "") } } } diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt index 20796ee47..7ee9eaf2d 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/common/IdentityTests.kt @@ -31,7 +31,7 @@ class IdentityTests { Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "latest", id1.version ) - Assert.assertEquals( "app_12.signup.alerts.app", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app", id1.name ) Assert.assertEquals( "app_1.signup.alerts.app.qat.latest", id1.full ) } @@ -44,7 +44,7 @@ class IdentityTests { Assert.assertEquals( Agent.App, id1.agent ) Assert.assertEquals( EnvMode.Qat.name, id1.env ) Assert.assertEquals( "1.2", id1.version ) - Assert.assertEquals( "app_1.signup.alerts", id1.name ) + Assert.assertEquals( "app_1.signup.alerts.app", id1.name ) Assert.assertEquals( "app_1.signup.alerts.app.qat.1_2", id1.full ) } diff --git a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt index 87749473d..deda5923e 100644 --- a/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt +++ b/src/lib/kotlin/slatekit-tests/src/test/kotlin/test/jobs/Job_Create_Tests.kt @@ -24,7 +24,6 @@ class Job_Create_Tests : JobTestSupport { Assert.assertEquals(wrk.worker, mgr.get(0)?.worker) Assert.assertEquals(wrk.worker, mgr.get(wrk.id)?.worker) - Assert.assertEquals(wrk.worker, mgr.get("kiit.tests.job.Job.${wrk.id.instance}")?.worker) } From a622d10fa94ce89769cbe2977dfc4d35cc5ced95 Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:23:37 -0500 Subject: [PATCH 6/7] remove: gradle references to slatekit --- src/common/common/build.gradle | 12 ++++++------ src/common/context/build.gradle | 12 ++++++------ src/common/requests/build.gradle | 12 ++++++------ src/common/result/build.gradle | 12 ++++++------ src/common/telemetry/build.gradle | 12 ++++++------ src/common/utils/build.gradle | 12 ++++++------ src/connectors/connectors-cli/build.gradle | 12 ++++++------ src/connectors/connectors-entities/build.gradle | 12 ++++++------ src/connectors/connectors-jobs/build.gradle | 12 ++++++------ src/data/data/build.gradle | 12 ++++++------ src/data/entities/build.gradle | 12 ++++++------ src/data/migrations/build.gradle | 12 ++++++------ src/data/query/build.gradle | 12 ++++++------ src/infra/cache/build.gradle | 12 ++++++------ src/infra/comms/build.gradle | 12 ++++++------ src/infra/core/build.gradle | 12 ++++++------ src/infra/db/build.gradle | 12 ++++++------ src/internal/actors/build.gradle | 12 ++++++------ src/internal/http/build.gradle | 12 ++++++------ src/internal/meta/build.gradle | 12 ++++++------ src/internal/policy/build.gradle | 12 ++++++------ src/internal/serialization/build.gradle | 12 ++++++------ src/lib/kotlin/kiit/build.gradle | 12 ++++++------ src/lib/kotlin/slatekit-tests/build.gradle | 4 ++-- src/providers/providers-aws/build.gradle | 12 ++++++------ src/providers/providers-datadog/build.gradle | 12 ++++++------ src/providers/providers-kafka/build.gradle | 12 ++++++------ src/providers/providers-logback/build.gradle | 12 ++++++------ src/services/apis/build.gradle | 12 ++++++------ src/services/app/build.gradle | 12 ++++++------ src/services/cli/build.gradle | 12 ++++++------ src/services/jobs/build.gradle | 12 ++++++------ src/services/server/build.gradle | 12 ++++++------ src/support/generator/build.gradle | 12 ++++++------ src/support/integration/build.gradle | 12 ++++++------ 35 files changed, 206 insertions(+), 206 deletions(-) diff --git a/src/common/common/build.gradle b/src/common/common/build.gradle index 491e95e0b..9656b2124 100644 --- a/src/common/common/build.gradle +++ b/src/common/common/build.gradle @@ -80,12 +80,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/common/context/build.gradle b/src/common/context/build.gradle index 361490de4..af149a351 100644 --- a/src/common/context/build.gradle +++ b/src/common/context/build.gradle @@ -81,12 +81,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/common/requests/build.gradle b/src/common/requests/build.gradle index 002c81a29..517f8c593 100644 --- a/src/common/requests/build.gradle +++ b/src/common/requests/build.gradle @@ -84,12 +84,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/common/result/build.gradle b/src/common/result/build.gradle index ce208eb4a..57cd06319 100644 --- a/src/common/result/build.gradle +++ b/src/common/result/build.gradle @@ -70,12 +70,12 @@ def kiitComponentVersion = ext.kiit_version ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { doLast { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/common/telemetry/build.gradle b/src/common/telemetry/build.gradle index 01e3b8454..598ac7504 100644 --- a/src/common/telemetry/build.gradle +++ b/src/common/telemetry/build.gradle @@ -86,12 +86,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/common/utils/build.gradle b/src/common/utils/build.gradle index ed5ffcfe4..8497677af 100644 --- a/src/common/utils/build.gradle +++ b/src/common/utils/build.gradle @@ -83,12 +83,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/connectors/connectors-cli/build.gradle b/src/connectors/connectors-cli/build.gradle index 2571c9a2a..2858c3d98 100644 --- a/src/connectors/connectors-cli/build.gradle +++ b/src/connectors/connectors-cli/build.gradle @@ -99,12 +99,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/connectors/connectors-entities/build.gradle b/src/connectors/connectors-entities/build.gradle index 6e226d3d5..c31e6b968 100644 --- a/src/connectors/connectors-entities/build.gradle +++ b/src/connectors/connectors-entities/build.gradle @@ -97,12 +97,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/connectors/connectors-jobs/build.gradle b/src/connectors/connectors-jobs/build.gradle index 98177e86e..ce37ba8a0 100644 --- a/src/connectors/connectors-jobs/build.gradle +++ b/src/connectors/connectors-jobs/build.gradle @@ -105,12 +105,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/data/data/build.gradle b/src/data/data/build.gradle index 609aea475..9e044f89f 100644 --- a/src/data/data/build.gradle +++ b/src/data/data/build.gradle @@ -82,12 +82,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/data/entities/build.gradle b/src/data/entities/build.gradle index 8c0189583..5a46d4e86 100644 --- a/src/data/entities/build.gradle +++ b/src/data/entities/build.gradle @@ -89,12 +89,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/data/migrations/build.gradle b/src/data/migrations/build.gradle index 298071d5d..3e92bd69a 100644 --- a/src/data/migrations/build.gradle +++ b/src/data/migrations/build.gradle @@ -91,12 +91,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/data/query/build.gradle b/src/data/query/build.gradle index 9fb2b43ea..8a3741448 100644 --- a/src/data/query/build.gradle +++ b/src/data/query/build.gradle @@ -79,12 +79,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/infra/cache/build.gradle b/src/infra/cache/build.gradle index fda7e5ac5..3fa471b44 100644 --- a/src/infra/cache/build.gradle +++ b/src/infra/cache/build.gradle @@ -86,12 +86,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/infra/comms/build.gradle b/src/infra/comms/build.gradle index d3a622a92..807e6d8fe 100644 --- a/src/infra/comms/build.gradle +++ b/src/infra/comms/build.gradle @@ -88,12 +88,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/infra/core/build.gradle b/src/infra/core/build.gradle index 3827a3145..c640cdbcc 100644 --- a/src/infra/core/build.gradle +++ b/src/infra/core/build.gradle @@ -83,12 +83,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/infra/db/build.gradle b/src/infra/db/build.gradle index 6bc36f2d0..7bb7f1aab 100644 --- a/src/infra/db/build.gradle +++ b/src/infra/db/build.gradle @@ -83,12 +83,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/internal/actors/build.gradle b/src/internal/actors/build.gradle index 2f52ec3f9..dc758f53b 100644 --- a/src/internal/actors/build.gradle +++ b/src/internal/actors/build.gradle @@ -70,12 +70,12 @@ def kiitComponentVersion = ext.kiit_version ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { doLast { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/internal/http/build.gradle b/src/internal/http/build.gradle index 8f2710526..e7687a09b 100644 --- a/src/internal/http/build.gradle +++ b/src/internal/http/build.gradle @@ -82,12 +82,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/internal/meta/build.gradle b/src/internal/meta/build.gradle index ba9cc024a..04f3afdfa 100644 --- a/src/internal/meta/build.gradle +++ b/src/internal/meta/build.gradle @@ -86,12 +86,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/internal/policy/build.gradle b/src/internal/policy/build.gradle index 9eeed3380..8c59c8e5f 100644 --- a/src/internal/policy/build.gradle +++ b/src/internal/policy/build.gradle @@ -85,12 +85,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/internal/serialization/build.gradle b/src/internal/serialization/build.gradle index e7eddb0c5..bb00660dc 100644 --- a/src/internal/serialization/build.gradle +++ b/src/internal/serialization/build.gradle @@ -89,12 +89,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/lib/kotlin/kiit/build.gradle b/src/lib/kotlin/kiit/build.gradle index 842372736..ef69db6d1 100644 --- a/src/lib/kotlin/kiit/build.gradle +++ b/src/lib/kotlin/kiit/build.gradle @@ -149,12 +149,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/lib/kotlin/slatekit-tests/build.gradle b/src/lib/kotlin/slatekit-tests/build.gradle index cdfb5b694..0678bbe94 100644 --- a/src/lib/kotlin/slatekit-tests/build.gradle +++ b/src/lib/kotlin/slatekit-tests/build.gradle @@ -53,8 +53,8 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation "mysql:mysql-connector-java:5.1.13" // https://mvnrepository.com/artifact/com.h2database/h2 - testImplementation group: 'com.h2database', name: 'h2' , version: '1.4.200' - testImplementation group: 'org.xerial' , name:'sqlite-jdbc', version:'3.8.11.2' + implementation group: 'com.h2database', name: 'h2' , version: '1.4.200' + implementation group: 'org.xerial' , name:'sqlite-jdbc', version:'3.8.11.2' //implementation "com.h2database:h2:1.4.200" implementation 'org.koin:koin-core:2.0.0-rc-2' implementation "org.json:json:20201115" diff --git a/src/providers/providers-aws/build.gradle b/src/providers/providers-aws/build.gradle index aa5bfc0f4..68185c14d 100644 --- a/src/providers/providers-aws/build.gradle +++ b/src/providers/providers-aws/build.gradle @@ -88,12 +88,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/providers/providers-datadog/build.gradle b/src/providers/providers-datadog/build.gradle index 3b88d219f..5fae454b8 100644 --- a/src/providers/providers-datadog/build.gradle +++ b/src/providers/providers-datadog/build.gradle @@ -92,12 +92,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/providers/providers-kafka/build.gradle b/src/providers/providers-kafka/build.gradle index 66cec8f09..a88cc7fd3 100644 --- a/src/providers/providers-kafka/build.gradle +++ b/src/providers/providers-kafka/build.gradle @@ -89,12 +89,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/providers/providers-logback/build.gradle b/src/providers/providers-logback/build.gradle index 1c363c806..c3624d407 100644 --- a/src/providers/providers-logback/build.gradle +++ b/src/providers/providers-logback/build.gradle @@ -89,12 +89,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/services/apis/build.gradle b/src/services/apis/build.gradle index 64f6930bd..87524a369 100644 --- a/src/services/apis/build.gradle +++ b/src/services/apis/build.gradle @@ -93,12 +93,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== task info { doLast { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/services/app/build.gradle b/src/services/app/build.gradle index 2476e166f..484182daf 100644 --- a/src/services/app/build.gradle +++ b/src/services/app/build.gradle @@ -86,12 +86,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/services/cli/build.gradle b/src/services/cli/build.gradle index aa3f42839..38efec4b9 100644 --- a/src/services/cli/build.gradle +++ b/src/services/cli/build.gradle @@ -87,12 +87,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/services/jobs/build.gradle b/src/services/jobs/build.gradle index 469d56348..1f8097d1e 100644 --- a/src/services/jobs/build.gradle +++ b/src/services/jobs/build.gradle @@ -84,12 +84,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/services/server/build.gradle b/src/services/server/build.gradle index 7bc3bc649..2b64c5500 100644 --- a/src/services/server/build.gradle +++ b/src/services/server/build.gradle @@ -107,12 +107,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/support/generator/build.gradle b/src/support/generator/build.gradle index 88d5b93c4..8c4bc782a 100644 --- a/src/support/generator/build.gradle +++ b/src/support/generator/build.gradle @@ -89,12 +89,12 @@ def kiitComponentVersion = ext.kiit_version // ================================================================== ext.kiitSetupViaBinary = System.getenv('KIIT_PROJECT_MODE') != 'sources' task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) diff --git a/src/support/integration/build.gradle b/src/support/integration/build.gradle index 570845329..cd8e3f185 100644 --- a/src/support/integration/build.gradle +++ b/src/support/integration/build.gradle @@ -112,12 +112,12 @@ def kiitComponentVersion = ext.kiit_version // Slate Kit Setup mode: defaults to maven vs loading project sources // ================================================================== task info { - println('slatekit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) - println('slatekit.maven : ' + kiitSetupViaBinary) - println('slatekit.comp.id : ' + kiitComponentId) - println('slatekit.comp.name : ' + kiitComponentName) - println('slatekit.comp.desc : ' + kiitComponentDesc) - println('slatekit.comp.vers : ' + kiitComponentVersion) + println('kiit.setup : ' + System.getenv('KIIT_PROJECT_MODE')) + println('kiit.maven : ' + kiitSetupViaBinary) + println('kiit.comp.id : ' + kiitComponentId) + println('kiit.comp.name : ' + kiitComponentName) + println('kiit.comp.desc : ' + kiitComponentDesc) + println('kiit.comp.vers : ' + kiitComponentVersion) println() println('project.name : ' + project.name) println('project.path : ' + project.path) From 564564292c798e4bc3ce9e99d7578fa3a92e592c Mon Sep 17 00:00:00 2001 From: kishore Date: Fri, 24 Nov 2023 15:24:32 -0500 Subject: [PATCH 7/7] fix: gradle references for production --- src/common/common/build.gradle | 4 ++-- src/common/context/build.gradle | 4 ++-- src/common/requests/build.gradle | 4 ++-- src/common/telemetry/build.gradle | 4 ++-- src/common/utils/build.gradle | 4 ++-- src/connectors/connectors-cli/build.gradle | 4 ++-- src/connectors/connectors-entities/build.gradle | 4 ++-- src/connectors/connectors-jobs/build.gradle | 4 ++-- src/data/data/build.gradle | 4 ++-- src/data/entities/build.gradle | 4 ++-- src/data/migrations/build.gradle | 4 ++-- src/data/query/build.gradle | 4 ++-- src/infra/cache/build.gradle | 4 ++-- src/infra/comms/build.gradle | 4 ++-- src/infra/core/build.gradle | 4 ++-- src/infra/db/build.gradle | 4 ++-- src/internal/http/build.gradle | 4 ++-- src/internal/meta/build.gradle | 4 ++-- src/internal/policy/build.gradle | 4 ++-- src/internal/serialization/build.gradle | 4 ++-- src/lib/kotlin/kiit/build.gradle | 4 ++-- src/providers/providers-aws/build.gradle | 4 ++-- src/providers/providers-datadog/build.gradle | 4 ++-- src/providers/providers-kafka/build.gradle | 4 ++-- src/providers/providers-logback/build.gradle | 4 ++-- src/services/apis/build.gradle | 4 ++-- src/services/app/build.gradle | 4 ++-- src/services/cli/build.gradle | 4 ++-- src/services/jobs/build.gradle | 4 ++-- src/services/server/build.gradle | 4 ++-- src/support/generator/build.gradle | 4 ++-- src/support/integration/build.gradle | 4 ++-- 32 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/common/common/build.gradle b/src/common/common/build.gradle index 9656b2124..c3fe69442 100644 --- a/src/common/common/build.gradle +++ b/src/common/common/build.gradle @@ -59,13 +59,13 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if (kiitSetupViaBinary) { implementation "dev.kiit:kiit-results:$kiit_version" } else { // */ implementation project(":kiit-result") - // } // + } // } // ================================================================== diff --git a/src/common/context/build.gradle b/src/common/context/build.gradle index af149a351..78c7df009 100644 --- a/src/common/context/build.gradle +++ b/src/common/context/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if (kiitSetupViaBinary) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -66,7 +66,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // ================================================================== diff --git a/src/common/requests/build.gradle b/src/common/requests/build.gradle index 517f8c593..e8fa26f78 100644 --- a/src/common/requests/build.gradle +++ b/src/common/requests/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -68,7 +68,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // ================================================================== diff --git a/src/common/telemetry/build.gradle b/src/common/telemetry/build.gradle index 598ac7504..38bd4f9d6 100644 --- a/src/common/telemetry/build.gradle +++ b/src/common/telemetry/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-requests") - // } // + } // } // ================================================================== diff --git a/src/common/utils/build.gradle b/src/common/utils/build.gradle index 8497677af..08d16d29b 100644 --- a/src/common/utils/build.gradle +++ b/src/common/utils/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -67,7 +67,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // ================================================================== diff --git a/src/connectors/connectors-cli/build.gradle b/src/connectors/connectors-cli/build.gradle index 2858c3d98..66d076c11 100644 --- a/src/connectors/connectors-cli/build.gradle +++ b/src/connectors/connectors-cli/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -83,7 +83,7 @@ dependencies { implementation project(":kiit-requests") implementation project(":kiit-apis") implementation project(":kiit-cli") - // } // + } // } // ================================================================== diff --git a/src/connectors/connectors-entities/build.gradle b/src/connectors/connectors-entities/build.gradle index c31e6b968..ab023ca39 100644 --- a/src/connectors/connectors-entities/build.gradle +++ b/src/connectors/connectors-entities/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -81,7 +81,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-db") implementation project(":kiit-entities") - // } // + } // } // ================================================================== diff --git a/src/connectors/connectors-jobs/build.gradle b/src/connectors/connectors-jobs/build.gradle index ce37ba8a0..c72e46e9d 100644 --- a/src/connectors/connectors-jobs/build.gradle +++ b/src/connectors/connectors-jobs/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -89,7 +89,7 @@ dependencies { implementation project(":kiit-jobs") implementation project(":connectors-entities") implementation project(":providers-aws") - // } // + } // } // ================================================================== diff --git a/src/data/data/build.gradle b/src/data/data/build.gradle index 9e044f89f..8fb463f23 100644 --- a/src/data/data/build.gradle +++ b/src/data/data/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -69,7 +69,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-meta") implementation project(":kiit-query") - // } // + } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/entities/build.gradle b/src/data/entities/build.gradle index 5a46d4e86..cb4fc95f0 100644 --- a/src/data/entities/build.gradle +++ b/src/data/entities/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -76,7 +76,7 @@ dependencies { implementation project(":kiit-data") implementation project(":kiit-query") implementation project(":kiit-meta") - // } // + } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/migrations/build.gradle b/src/data/migrations/build.gradle index 3e92bd69a..ae1e087da 100644 --- a/src/data/migrations/build.gradle +++ b/src/data/migrations/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -77,7 +77,7 @@ dependencies { implementation project(":kiit-data") implementation project(":kiit-entities") implementation project(":kiit-meta") - // } // + } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/data/query/build.gradle b/src/data/query/build.gradle index 8a3741448..5ae74b1c5 100644 --- a/src/data/query/build.gradle +++ b/src/data/query/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -65,7 +65,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/infra/cache/build.gradle b/src/infra/cache/build.gradle index 3fa471b44..eeef1cdce 100644 --- a/src/infra/cache/build.gradle +++ b/src/infra/cache/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-core") implementation project(":kiit-telemetry") - // } // + } // } // ================================================================== diff --git a/src/infra/comms/build.gradle b/src/infra/comms/build.gradle index 807e6d8fe..ce9f59e65 100644 --- a/src/infra/comms/build.gradle +++ b/src/infra/comms/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -71,7 +71,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-http") - // } // + } // } // ================================================================== diff --git a/src/infra/core/build.gradle b/src/infra/core/build.gradle index c640cdbcc..c1c5fd497 100644 --- a/src/infra/core/build.gradle +++ b/src/infra/core/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -68,7 +68,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-utils") - // } // + } // } // ================================================================== diff --git a/src/infra/db/build.gradle b/src/infra/db/build.gradle index 7bb7f1aab..68fd287e5 100644 --- a/src/infra/db/build.gradle +++ b/src/infra/db/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation "com.amazonaws:aws-java-sdk-sqs:1.11.100" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -69,7 +69,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // Slate Kit Component info ( for variables for pom / package / etc ) diff --git a/src/internal/http/build.gradle b/src/internal/http/build.gradle index e7687a09b..583b93e6d 100644 --- a/src/internal/http/build.gradle +++ b/src/internal/http/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -67,7 +67,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // ================================================================== diff --git a/src/internal/meta/build.gradle b/src/internal/meta/build.gradle index 04f3afdfa..856a0f7e5 100644 --- a/src/internal/meta/build.gradle +++ b/src/internal/meta/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -71,7 +71,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-requests") - // } // + } // } // ================================================================== diff --git a/src/internal/policy/build.gradle b/src/internal/policy/build.gradle index 8c59c8e5f..d526717e1 100644 --- a/src/internal/policy/build.gradle +++ b/src/internal/policy/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -68,7 +68,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-telemetry") - // } // + } // } // ================================================================== diff --git a/src/internal/serialization/build.gradle b/src/internal/serialization/build.gradle index bb00660dc..614ffd359 100644 --- a/src/internal/serialization/build.gradle +++ b/src/internal/serialization/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "com.googlecode.json-simple:json-simple:1.1" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -72,7 +72,7 @@ dependencies { implementation project(":kiit-requests") implementation project(":kiit-meta") implementation project(":kiit-utils") - // } // + } // } // ================================================================== diff --git a/src/lib/kotlin/kiit/build.gradle b/src/lib/kotlin/kiit/build.gradle index ef69db6d1..05518f85d 100644 --- a/src/lib/kotlin/kiit/build.gradle +++ b/src/lib/kotlin/kiit/build.gradle @@ -66,7 +66,7 @@ dependencies { // implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:results:$kiit_version" implementation "dev.kiit:common:$kiit_version" @@ -131,7 +131,7 @@ dependencies { // implementation project(":kiit-integration") implementation project(":kiit-server") // implementation project(":slatekit-samples") - // } // + } // // implementation project(":slatekit-examples") // implementation project(":slatekit-samples") implementation project(":kiit-tests") diff --git a/src/providers/providers-aws/build.gradle b/src/providers/providers-aws/build.gradle index 68185c14d..abf57b0e5 100644 --- a/src/providers/providers-aws/build.gradle +++ b/src/providers/providers-aws/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-core") - // } // + } // } // ================================================================== diff --git a/src/providers/providers-datadog/build.gradle b/src/providers/providers-datadog/build.gradle index 5fae454b8..e5813c780 100644 --- a/src/providers/providers-datadog/build.gradle +++ b/src/providers/providers-datadog/build.gradle @@ -66,7 +66,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -76,7 +76,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-telemetry") - // } // + } // } // ================================================================== diff --git a/src/providers/providers-kafka/build.gradle b/src/providers/providers-kafka/build.gradle index a88cc7fd3..efdfed37e 100644 --- a/src/providers/providers-kafka/build.gradle +++ b/src/providers/providers-kafka/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'org.threeten:threetenbp:1.3.8' implementation 'org.apache.kafka:kafka-clients:2.4.0' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { implementation project(":kiit-result") implementation project(":kiit-common") implementation project(":kiit-core") - // } // + } // } // ================================================================== diff --git a/src/providers/providers-logback/build.gradle b/src/providers/providers-logback/build.gradle index c3624d407..7bb696924 100644 --- a/src/providers/providers-logback/build.gradle +++ b/src/providers/providers-logback/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -73,7 +73,7 @@ dependencies { // */ implementation project(":kiit-result") implementation project(":kiit-common") - // } // + } // } // ================================================================== diff --git a/src/services/apis/build.gradle b/src/services/apis/build.gradle index 87524a369..0ea673b6d 100644 --- a/src/services/apis/build.gradle +++ b/src/services/apis/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -77,7 +77,7 @@ dependencies { implementation project(":kiit-context") implementation project(":kiit-meta") implementation project(":kiit-serialization") - // } // + } // } // ================================================================== diff --git a/src/services/app/build.gradle b/src/services/app/build.gradle index 484182daf..0f67da1f4 100644 --- a/src/services/app/build.gradle +++ b/src/services/app/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -70,7 +70,7 @@ dependencies { implementation project(":kiit-common") implementation project(":kiit-utils") implementation project(":kiit-context") - // } // + } // } // ================================================================== diff --git a/src/services/cli/build.gradle b/src/services/cli/build.gradle index 38efec4b9..610cb2dee 100644 --- a/src/services/cli/build.gradle +++ b/src/services/cli/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -72,7 +72,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-requests") implementation project(":kiit-context") - // } // + } // } // ================================================================== diff --git a/src/services/jobs/build.gradle b/src/services/jobs/build.gradle index 1f8097d1e..15df36559 100644 --- a/src/services/jobs/build.gradle +++ b/src/services/jobs/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-actors:$kiit_version" @@ -69,7 +69,7 @@ dependencies { implementation project(":kiit-actors") implementation project(":kiit-common") implementation project(":kiit-utils") - // } // + } // } // ================================================================== diff --git a/src/services/server/build.gradle b/src/services/server/build.gradle index 2b64c5500..83baa695a 100644 --- a/src/services/server/build.gradle +++ b/src/services/server/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation 'org.threeten:threetenbp:1.3.8' implementation fileTree(dir: 'lib', include: '*.jar') - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -92,7 +92,7 @@ dependencies { implementation project(":kiit-telemetry") implementation project(":kiit-apis") implementation project(":kiit-serialization") - // } // + } // } // ================================================================== diff --git a/src/support/generator/build.gradle b/src/support/generator/build.gradle index 8c4bc782a..06811dbd6 100644 --- a/src/support/generator/build.gradle +++ b/src/support/generator/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -72,7 +72,7 @@ dependencies { implementation project(":kiit-utils") implementation project(":kiit-context") implementation project(":kiit-apis") - // } // + } // } // ================================================================== diff --git a/src/support/integration/build.gradle b/src/support/integration/build.gradle index cd8e3f185..5c9b0f103 100644 --- a/src/support/integration/build.gradle +++ b/src/support/integration/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'org.threeten:threetenbp:1.3.8' - /* + // /* if( kiitSetupViaBinary ) { implementation "dev.kiit:kiit-results:$kiit_version" implementation "dev.kiit:kiit-common:$kiit_version" @@ -96,7 +96,7 @@ dependencies { implementation project(":kiit-migrations") implementation project(":kiit-comms") implementation project(":connectors-entities") - // } // + } // } // ==================================================================