Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPGRADE: Gradle scripts #356

Merged
merged 6 commits into from
Nov 24, 2023
Merged

UPGRADE: Gradle scripts #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5cbd1c0
fix: gradle file loading
kishorereddy Nov 23, 2023
e4a9c19
fix: gradle file loading
kishorereddy Nov 23, 2023
c468b87
fix: gradle file loading
kishorereddy Nov 23, 2023
76190b6
fix: gradle file loading
kishorereddy Nov 23, 2023
e5ca76e
fix : gradel file loading
kishorereddy Nov 24, 2023
2fa1d3d
tests: added additional tests for status codes
kishorereddy Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/common/context/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/common/requests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/common/result/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/common/telemetry/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/common/utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 26 12:25:13 CET 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions src/connectors/connectors-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/connectors/connectors-entities/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/connectors/connectors-jobs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/data/data/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/data/entities/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/data/migrations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/data/query/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/infra/cache/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/infra/comms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/infra/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/infra/db/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/internal/actors/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/internal/http/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/internal/meta/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/internal/policy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/internal/serialization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/lib/kotlin/kiit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../../version.txt').text
ext.kiit_version_beta = new File('../../../version-beta.txt').text
ext.kiit_version = file('../../../version.txt').text
ext.kiit_version_beta = file('../../../version-beta.txt').text

repositories {
jcenter()
Expand Down
10 changes: 5 additions & 5 deletions src/lib/kotlin/slatekit-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

buildscript {
ext.kotlin_version = '1.6.20'
ext.slatekit_version = new File('../../version.txt').text
ext.slatekit_version_beta = new File('../../version-beta.txt').text
ext.slatekit_version = file('../../version.txt').text
ext.slatekit_version_beta = file('../../version-beta.txt').text

repositories {
mavenCentral()
Expand Down Expand Up @@ -36,10 +36,10 @@ repositories {
jcenter()
mavenCentral()
maven {
url "https://maven.pkg.github.com/slatekit/slatekit"
url "https://maven.pkg.github.com/slatekit/kiit"
credentials {
username = System.getenv('SLATEKIT_INSTALL_ACTOR')
password = System.getenv('SLATEKIT_INSTALL_TOKEN')
username = System.getenv('KIIT_INSTALL_ACTOR')
password = System.getenv('KIIT_INSTALL_TOKEN')
}
}
}
Expand Down
19 changes: 18 additions & 1 deletion src/lib/kotlin/slatekit-tests/src/test/kotlin/test/results/StatusTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,28 @@ import kiit.results.*
class StatusTests {

@Test
fun can_build_basic(){
fun can_build_basic_passed_category(){
val status = Passed.Succeeded("SUCCESS", 1, "success")
Assert.assertEquals("SUCCESS", status.name)
Assert.assertEquals(1, status.code)
Assert.assertEquals("success", status.desc)
Assert.assertEquals(true, status.success)
}


@Test
fun can_build_basic_failed_category(){
fun validate(status:Failed, name:String, code:Int, desc:String) {
Assert.assertEquals(name, status.name)
Assert.assertEquals(code, status.code)
Assert.assertEquals(desc, status.desc)
Assert.assertEquals(false, status.success)
}
validate(Failed.Ignored("IGNORED", 2, "ignored"), "IGNORED", 2, "ignored")
validate(Failed.Invalid("INVALID", 3, "invalid"), "INVALID", 3, "invalid")
validate(Failed.Denied ("DENIED" , 4, "denied" ), "DENIED" , 4, "denied" )
validate(Failed.Errored("ERRORED", 5, "errored"), "ERRORED", 5, "errored")
validate(Failed.Unknown("UNKNOWN", 6, "unknown"), "UNKNOWN", 6, "unknown")
}


Expand Down
2 changes: 0 additions & 2 deletions src/lib/kotlin/slatekit-tests/src/test/kotlin/test/setup/SampleAnnoApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,4 @@ class SampleAnnoApi(val context: AppEntContext) {

@Action(desc = "accepts a smart string of email", roles= [Roles.GUEST])
fun smartStringEmail(text: Email): String = "${text.value}"


}
4 changes: 2 additions & 2 deletions src/providers/providers-aws/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/providers/providers-datadog/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/providers/providers-kafka/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/providers/providers-logback/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/services/apis/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/services/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/services/cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/services/jobs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
4 changes: 2 additions & 2 deletions src/services/server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
ext.kotlin_version = '1.6.20'
ext.ktor_version = '1.6.8'
ext.kiit_version = new File('../../version.txt').text
ext.kiit_version_beta = new File('../../version-beta.txt').text
ext.kiit_version = file('../../version.txt').text
ext.kiit_version_beta = file('../../version-beta.txt').text

repositories {
jcenter()
Expand Down
Loading