Skip to content

Commit

Permalink
Merge pull request #140 from atlassian/noissue/remove-unnecessary-libs
Browse files Browse the repository at this point in the history
Removing unnecessary libs - Adding version catalog
  • Loading branch information
diegoocampoh authored Oct 6, 2023
2 parents f2471be + 6028dc7 commit a494a10
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 16 deletions.
26 changes: 11 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.9.10"
id("org.jetbrains.dokka") version "1.9.0"
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.ktlint)
alias(libs.plugins.dokka)
id("maven-publish")
id("signing")
application
id("org.jlleitschuh.gradle.ktlint") version "11.6.0"
}

repositories {
Expand All @@ -19,17 +18,14 @@ java {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10")
implementation("commons-codec:commons-codec:1.16.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
testImplementation(kotlin("test"))
testImplementation("io.mockk:mockk:1.13.8")
testImplementation("io.kotest:kotest-assertions-core:5.7.2")
testImplementation("io.kotest:kotest-framework-datatest:5.7.2")
testImplementation("io.kotest:kotest-runner-junit5:5.7.2")
testImplementation("io.kotest:kotest-property:5.7.2")
testImplementation("io.kotest.extensions:kotest-property-arrow:1.4.0")
testImplementation("io.kotest.extensions:kotest-assertions-arrow:1.4.0")
implementation(libs.kotlin.stdlib)
implementation(libs.commonsCodecs)
implementation(libs.kotlinx.coroutinesCore)

testImplementation(libs.mockk)
testImplementation(libs.kotest.frameworkDatatest)
testImplementation(libs.kotest.runnerJUnit5)
testImplementation(libs.kotest.property)
}

group = "com.atlassian"
Expand Down
36 changes: 36 additions & 0 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[versions]

commonsCodec = "1.16.0"
dokkaPlugin = "1.9.0"
kotest = "5.7.2"
kotlin = "1.9.10"
ktlintPlugin = "11.6.0"
kotlinxCoroutines = "1.7.3"
mockk = "1.13.8"

[bundles]
kotest = [
"kotest-property",
"kotest-frameworkDatatest"
]

[libraries]
# kotlin
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlinx-coroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }

# Kotest
kotest-runnerJUnit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
kotest-frameworkDatatest = { module = "io.kotest:kotest-framework-datatest", version.ref = "kotest" }

# mockk
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

# Commons codecs
commonsCodecs = { module = "commons-codec:commons-codec", version.ref = "commonsCodec" }

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintPlugin" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaPlugin" }
1 change: 0 additions & 1 deletion settings.gradle

This file was deleted.

9 changes: 9 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
rootProject.name = "onetime"

dependencyResolutionManagement {
versionCatalogs {
create("libs") {
from(files("libs.versions.toml"))
}
}
}

0 comments on commit a494a10

Please sign in to comment.