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.

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

Introduce version catalog, closes #170 #172

Merged
merged 1 commit into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions confidence-asm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
implementation project(':confidence-core')
implementation 'org.dmfs:jems2:2.21.0'
implementation 'org.dmfs:jems2-confidence:2.21.0'
implementation 'org.ow2.asm:asm:9.6'
implementation 'org.ow2.asm:asm-tree:9.6'
testImplementation 'org.dmfs:jems2-testing:2.21.0'
implementation libs.asm
implementation libs.asm.tree
implementation libs.jems2
implementation libs.jems2.confidence

testImplementation project(':confidence-test')
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation libs.jems2.testing
testImplementation libs.junit.jupiter.api
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
20 changes: 10 additions & 10 deletions confidence-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
compileOnly 'org.hamcrest:hamcrest:2.2'
implementation 'org.dmfs:jems2:2.17.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
compileOnly libs.hamcrest
implementation libs.jems2

testImplementation project(':confidence-test')
testImplementation 'org.dmfs:jems2-testing:2.17.0'
testImplementation 'org.hamcrest:hamcrest:2.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation libs.jems2.testing
testImplementation libs.hamcrest
testImplementation libs.junit.jupiter.api
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
27 changes: 14 additions & 13 deletions confidence-incubator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,22 @@ configurations {


dependencies {
compileOnly 'org.mockito:mockito-core:4.6.1'
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
implementation 'org.dmfs:jems2:2.19.0'
implementation 'org.dmfs:jems2-confidence:2.19.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
compileOnly libs.mockito4
implementation libs.jems2
implementation libs.junit.jupiter.api
implementation libs.junit.jupiter.engine
implementation project(':confidence-core')
intTestImplementation project(':confidence-core')
implementation libs.jems2.confidence

testImplementation project(':confidence-test')
testImplementation 'org.dmfs:jems2-testing:2.19.0'
testImplementation 'org.mockito:mockito-core:4.6.1'
implementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
implementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation 'org.junit.platform:junit-platform-testkit:1.9.2'
testImplementation libs.jems2.testing
testImplementation libs.mockito4
testImplementation libs.junit.testkit

intTestImplementation project(':confidence-core')
}

test {
Expand Down
28 changes: 14 additions & 14 deletions confidence-json/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
implementation libs.jems2
implementation libs.jems2.confidence
implementation project(':confidence-core')
implementation 'org.dmfs:jems2:2.21.0'
implementation 'org.dmfs:jems2-confidence:2.21.0'
implementation 'org.json:json:20230618'
compileOnly 'io.rest-assured:json-path:5.4.0'
compileOnly 'org.dmfs:express-json:0.3.1'
testImplementation 'org.dmfs:jems2-testing:2.21.0'
implementation libs.org.json
compileOnly libs.json.path
compileOnly libs.express.json

testImplementation project(':confidence-test')
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testImplementation 'io.rest-assured:json-path:5.4.0'
testImplementation 'org.dmfs:express-json:0.3.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation libs.jems2.testing
testImplementation libs.junit.jupiter.api
testImplementation libs.express.json
testImplementation libs.json.path
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
20 changes: 10 additions & 10 deletions confidence-mockito4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.mockito:mockito-core:4.6.1'
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
implementation 'org.dmfs:jems2:2.17.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
implementation project(':confidence-core')
implementation libs.jems2
compileOnly libs.mockito4

testImplementation libs.mockito4
testImplementation project(':confidence-test')
testImplementation 'org.dmfs:jems2-testing:2.17.0'
testImplementation 'org.mockito:mockito-core:4.6.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation libs.jems2.testing
testImplementation libs.junit.jupiter.api
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
20 changes: 10 additions & 10 deletions confidence-rxjava3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
compileOnly 'io.reactivex.rxjava3:rxjava:3.1.6'
implementation 'org.dmfs:jems2:2.17.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
implementation project(':confidence-core')
compileOnly libs.rxjava3
implementation libs.jems2

testImplementation project(':confidence-test')
testImplementation 'io.reactivex.rxjava3:rxjava:3.1.5'
testImplementation 'org.dmfs:jems2-testing:2.17.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation libs.rxjava3
testImplementation libs.jems2.testing
testImplementation libs.junit.jupiter.api
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
16 changes: 8 additions & 8 deletions confidence-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600'
compileOnly 'org.dmfs:srcless-annotations:0.3.0'
annotationProcessor 'org.dmfs:srcless-processors:0.3.0'
annotationProcessor 'org.dmfs:nullless-processors:0.3.0'
compileOnly libs.eclipse.jdt.anntation
compileOnly libs.srcless.annotations
annotationProcessor libs.bundles.srcless.processors
implementation project(':confidence-core')
implementation 'org.dmfs:jems2:2.17.0'
testImplementation 'org.dmfs:jems2-testing:2.17.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
implementation libs.jems2

testImplementation libs.jems2.testing
testImplementation libs.junit.jupiter.api
testRuntimeOnly libs.junit.jupiter.engine
}

test {
Expand Down
45 changes: 45 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[versions]
asm = "9.6"
eclipse-jdt = "2.2.600"
express = "0.3.1"
hamcrest = "2.2"
jems2 = "2.22.0"
json-path = "5.4.0"
junit = "5.8.2"
junit-testkit = "1.9.2"
mockito4 = "4.6.1"
org-json = "20230618"
rxjava3 = "3.1.6"
srcless = "0.3.0"

[libraries]
srcless-annotations = { module = "org.dmfs:srcless-annotations", version.ref = "srcless" }
srcless-processors = { module = "org.dmfs:srcless-processors", version.ref = "srcless" }
eclipse-jdt-anntation = { module = 'org.eclipse.jdt:org.eclipse.jdt.annotation', version.ref = "eclipse-jdt" }
nullless-processors = { module = "org.dmfs:nullless-processors", version.ref = "srcless" }

junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit-testkit = { module = 'org.junit.platform:junit-platform-testkit', version.ref = "junit-testkit" }
hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }

mockito4 = { module = 'org.mockito:mockito-core', version.ref = "mockito4" }

asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
asm-tree = { module = 'org.ow2.asm:asm-tree', version.ref = "asm" }

jems2 = { module = "org.dmfs:jems2", version.ref = "jems2" }
jems2-testing = { module = "org.dmfs:jems2-testing", version.ref = "jems2" }
jems2-confidence = { module = "org.dmfs:jems2-confidence", version.ref = "jems2" }

express-json = { module = "org.dmfs:express-json", version.ref = "express" }

rxjava3 = { module = 'io.reactivex.rxjava3:rxjava', version.ref = "rxjava3" }

org-json = { module = "org.json:json", version.ref = "org-json" }
json-path = { module = "io.rest-assured:json-path", version.ref = "json-path" }

[bundles]
srcless-processors = ["srcless-processors", "nullless-processors"]

[plugins]