Skip to content

Commit 3e70496

Browse files
jpnovaisjpnovais
committed
jvm-libs layout rearrange
1 parent 62438cb commit 3e70496

File tree

177 files changed

+149
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+149
-152
lines changed

‎coordinator/app/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ configurations.configureEach {
1010
}
1111

1212
dependencies {
13-
implementation project(':jvm-libs:json-rpc')
14-
implementation project(':jvm-libs:http-rest')
15-
implementation project(':jvm-libs:vertx-helper')
16-
implementation project(':jvm-libs:future-extensions')
17-
implementation project(':jvm-libs:web3j-extensions')
18-
implementation project(':jvm-libs:core:metrics')
19-
implementation project(':jvm-libs:metrics:micrometer')
20-
implementation project(':jvm-libs:core:domain-models')
13+
implementation project(':jvm-libs:generic:json-rpc')
14+
implementation project(':jvm-libs:generic:http-rest')
15+
implementation project(':jvm-libs:generic:vertx-helper')
16+
implementation project(':jvm-libs:generic:extensions:futures')
17+
implementation project(':jvm-libs:linea:web3j-extensions')
18+
implementation project(':jvm-libs:linea:core:metrics')
19+
implementation project(':jvm-libs:linea:metrics:micrometer')
20+
implementation project(':jvm-libs:linea:core:domain-models')
2121
implementation project(':coordinator:utilities')
2222
implementation project(':coordinator:core')
2323
implementation project(':coordinator:clients:shomei-client')
@@ -36,7 +36,7 @@ dependencies {
3636
implementation project(':coordinator:persistence:aggregation')
3737
implementation project(':coordinator:persistence:batch')
3838
implementation project(':coordinator:persistence:feehistory')
39-
implementation project(":jvm-libs:teku-execution-client")
39+
implementation project(":jvm-libs:linea:teku-execution-client")
4040
implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
4141

4242
implementation project(':coordinator:ethereum:gas-pricing:static-cap')

‎coordinator/clients/prover-client/file-based-client/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies {
88
implementation project(':coordinator:clients:smart-contract-client')
99
api project(':coordinator:clients:prover-client:serialization')
1010
implementation project(':coordinator:utilities')
11-
implementation project(':jvm-libs:metrics:micrometer')
12-
implementation project(':jvm-libs:future-extensions')
13-
implementation project(':jvm-libs:kotlin-extensions')
14-
implementation project(':jvm-libs:core:domain-models')
11+
implementation project(':jvm-libs:linea:metrics:micrometer')
12+
implementation project(':jvm-libs:generic:extensions:futures')
13+
implementation project(':jvm-libs:generic:extensions:kotlin')
14+
implementation project(':jvm-libs:linea:core:domain-models')
1515
implementation project(':coordinator:ethereum:models-helper')
1616

1717
implementation "io.vertx:vertx-core"
@@ -25,7 +25,7 @@ dependencies {
2525
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
2626
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
2727

28-
testImplementation project(':jvm-libs:testing-teku-helper')
28+
testImplementation project(':jvm-libs:linea:testing:teku-helper')
2929
testImplementation "io.vertx:vertx-junit5"
3030
testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}"
3131
testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}:test-fixtures"

‎coordinator/clients/prover-client/serialization/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
api "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
88
api "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
99
api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
10-
api(project(":jvm-libs:kotlin-extensions"))
10+
api(project(":jvm-libs:generic:extensions:kotlin"))
1111
api(project(":coordinator:core"))
1212
}
1313

‎coordinator/clients/shomei-client/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44

55
dependencies {
66
implementation project(':coordinator:core')
7-
implementation project(':jvm-libs:future-extensions')
8-
implementation project(':jvm-libs:json-rpc')
9-
implementation project(':jvm-libs:metrics:micrometer')
10-
implementation project(':jvm-libs:traces')
11-
implementation project(":jvm-libs:teku-execution-client")
7+
implementation project(':jvm-libs:generic:extensions:futures')
8+
implementation project(':jvm-libs:generic:json-rpc')
9+
implementation project(':jvm-libs:linea:metrics:micrometer')
10+
implementation project(':jvm-libs:linea:core:traces')
11+
implementation project(":jvm-libs:linea:teku-execution-client")
1212
implementation "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
1313

1414
api "io.vertx:vertx-core"

‎coordinator/clients/smart-contract-client/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
}
44

55
dependencies {
6-
implementation project(":jvm-libs:kotlin-extensions")
7-
implementation project(':jvm-libs:web3j-extensions')
6+
implementation project(":jvm-libs:generic:extensions:kotlin")
7+
implementation project(':jvm-libs:linea:web3j-extensions')
88
api 'build.linea:l1-rollup-contract-client:0.0.1'
99
api 'build.linea:l2-message-service-contract-client:0.0.1'
1010

‎coordinator/clients/traces-generator-api-client/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ plugins {
44

55
dependencies {
66
implementation project(':coordinator:core')
7-
implementation project(':jvm-libs:future-extensions')
8-
implementation project(':jvm-libs:json-rpc')
9-
implementation project(':jvm-libs:metrics:micrometer')
10-
implementation project(':jvm-libs:traces')
7+
implementation project(':jvm-libs:generic:extensions:futures')
8+
implementation project(':jvm-libs:generic:json-rpc')
9+
implementation project(':jvm-libs:linea:metrics:micrometer')
10+
implementation project(':jvm-libs:linea:core:traces')
1111
implementation "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
1212

1313
api "io.vertx:vertx-core"

‎coordinator/clients/type2-state-manager-client/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
dependencies {
66
implementation project(':coordinator:core')
7-
implementation project(':jvm-libs:json-rpc')
8-
implementation project(':jvm-libs:metrics:micrometer')
9-
implementation project(':jvm-libs:future-extensions')
7+
implementation project(':jvm-libs:generic:json-rpc')
8+
implementation project(':jvm-libs:linea:metrics:micrometer')
9+
implementation project(':jvm-libs:generic:extensions:futures')
1010

1111
implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
1212
implementation "io.vertx:vertx-core"

‎coordinator/clients/web3signer-client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
dependencies {
1010
implementation project(':coordinator:core')
11-
implementation project(':jvm-libs:http-rest')
11+
implementation project(':jvm-libs:generic:http-rest')
1212

1313
implementation "io.vertx:vertx-core"
1414
implementation "io.vertx:vertx-web-client"

‎coordinator/core/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ plugins {
66
dependencies {
77
api "build.linea:blob-compressor:${libs.versions.blobCompressor.get()}"
88
api "build.linea:blob-shnarf-calculator:${libs.versions.blobShnarfCalculator.get()}"
9-
api project(':jvm-libs:core:domain-models')
10-
api project(':jvm-libs:core:metrics')
11-
api project(':jvm-libs:core:long-running-service')
12-
api project(':jvm-libs:traces')
13-
api project(':jvm-libs:errors')
14-
api project(':jvm-libs:kotlin-extensions')
15-
api project(':jvm-libs:future-extensions')
9+
api project(':jvm-libs:linea:core:domain-models')
10+
api project(':jvm-libs:linea:core:metrics')
11+
api project(':jvm-libs:linea:core:long-running-service')
12+
api project(':jvm-libs:linea:core:traces')
13+
api project(':jvm-libs:generic:errors')
14+
api project(':jvm-libs:generic:extensions:kotlin')
15+
api project(':jvm-libs:generic:extensions:futures')
1616
api "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
1717
api "org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinxDatetime.get()}"
18-
implementation project(":jvm-libs:teku-execution-client")
18+
implementation project(":jvm-libs:linea:teku-execution-client")
1919
implementation "io.vertx:vertx-core"
2020
// jackson shall never be used in the core module
2121
// however, it is used already :( but was as transitive through Teku Execution Client
@@ -31,10 +31,10 @@ dependencies {
3131
testFixturesImplementation("org.web3j:core:${libs.versions.web3j.get()}") {
3232
exclude group: 'org.slf4j', module: 'slf4j-nop'
3333
}
34-
testImplementation project(":jvm-libs:testing-teku-helper")
35-
testImplementation project(':jvm-libs:metrics:micrometer')
36-
testImplementation(testFixtures(project(':jvm-libs:traces')))
37-
testImplementation(testFixtures(project(':jvm-libs:kotlin-extensions')))
34+
testImplementation project(":jvm-libs:linea:testing:teku-helper")
35+
testImplementation project(':jvm-libs:linea:metrics:micrometer')
36+
testImplementation(testFixtures(project(':jvm-libs:linea:core:traces')))
37+
testImplementation(testFixtures(project(':jvm-libs:generic:extensions:kotlin')))
3838
testImplementation("io.vertx:vertx-junit5")
3939
}
4040

‎coordinator/ethereum/blob-submitter/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ dependencies {
2121
implementation("org.web3j:core:${libs.versions.web3j.get()}") {
2222
exclude group: "org.slf4j", module: "slf4j-nop"
2323
}
24-
implementation project(":jvm-libs:teku-execution-client")
24+
implementation project(":jvm-libs:linea:teku-execution-client")
2525

26-
testImplementation(project(":jvm-libs:testing:l1-blob-and-proof-submission"))
26+
testImplementation(project(":jvm-libs:linea:testing:l1-blob-and-proof-submission"))
2727
testImplementation(project(":coordinator:persistence:aggregation"))
2828
testImplementation(testFixtures(project(":coordinator:persistence:db")))
2929
testImplementation(testFixtures(project(":coordinator:ethereum:gas-pricing")))
3030
testImplementation(testFixtures(project(":coordinator:core")))
31-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
31+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
3232
testImplementation("io.vertx:vertx-junit5")
3333
testImplementation("com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}")
3434
testImplementation("com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}")

‎coordinator/ethereum/common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
implementation(project(':coordinator:core'))
7-
implementation project(':jvm-libs:web3j-extensions')
7+
implementation project(':jvm-libs:linea:web3j-extensions')
88
implementation("org.web3j:core:${libs.versions.web3j.get()}") {
99
exclude group: "org.slf4j", module: "slf4j-nop"
1010
}

‎coordinator/ethereum/finalization-monitor/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ dependencies {
1414
exclude group: "org.slf4j", module: "slf4j-nop"
1515
}
1616
implementation(project(":coordinator:clients:smart-contract-client"))
17-
implementation(project(":jvm-libs:future-extensions"))
17+
implementation(project(":jvm-libs:generic:extensions:futures"))
1818

1919
testImplementation(project(":coordinator:ethereum:test-utils"))
20-
testImplementation(project(":jvm-libs:web3j-extensions"))
21-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
20+
testImplementation(project(":jvm-libs:linea:web3j-extensions"))
21+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
2222
testImplementation("io.vertx:vertx-junit5")
2323
}
2424

‎coordinator/ethereum/gas-pricing/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44
}
55

66
dependencies {
7-
implementation project(':jvm-libs:kotlin-extensions')
8-
implementation project(':jvm-libs:core:domain-models')
9-
implementation project(':jvm-libs:web3j-extensions')
7+
implementation project(':jvm-libs:generic:extensions:kotlin')
8+
implementation project(':jvm-libs:linea:core:domain-models')
9+
implementation project(':jvm-libs:linea:web3j-extensions')
1010

1111
testFixturesImplementation "tech.pegasys.teku.internal:async:${libs.versions.teku.get()}"
1212
testFixturesImplementation project(":coordinator:core")

‎coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ plugins {
33
}
44

55
dependencies {
6-
implementation project(':jvm-libs:vertx-helper')
7-
implementation project(':jvm-libs:kotlin-extensions')
8-
implementation project(':jvm-libs:web3j-extensions')
9-
implementation project(':jvm-libs:core:domain-models')
6+
implementation project(':jvm-libs:generic:vertx-helper')
7+
implementation project(':jvm-libs:generic:extensions:kotlin')
8+
implementation project(':jvm-libs:linea:web3j-extensions')
9+
implementation project(':jvm-libs:linea:core:domain-models')
1010
implementation(project(":coordinator:core"))
1111
implementation(project(":coordinator:ethereum:gas-pricing"))
1212

‎coordinator/ethereum/gas-pricing/static-cap/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
dependencies {
66
implementation(project(":coordinator:core"))
77
implementation(project(":coordinator:ethereum:gas-pricing"))
8-
implementation project(':jvm-libs:kotlin-extensions')
9-
implementation project(':jvm-libs:core:domain-models')
10-
implementation project(':jvm-libs:vertx-helper')
11-
implementation project(':jvm-libs:web3j-extensions')
12-
implementation project(':jvm-libs:json-rpc')
8+
implementation project(':jvm-libs:generic:extensions:kotlin')
9+
implementation project(':jvm-libs:linea:core:domain-models')
10+
implementation project(':jvm-libs:generic:vertx-helper')
11+
implementation project(':jvm-libs:linea:web3j-extensions')
12+
implementation project(':jvm-libs:generic:json-rpc')
1313

1414
testImplementation("io.vertx:vertx-junit5")
1515
testImplementation "com.github.tomakehurst:wiremock-jre8:${libs.versions.wiremock.get()}"

‎coordinator/ethereum/message-anchoring/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ plugins {
55
dependencies {
66
// TODO: review dependencies
77
implementation "io.vertx:vertx-core"
8-
implementation project(':jvm-libs:vertx-helper')
9-
implementation project(':jvm-libs:future-extensions')
10-
implementation project(':jvm-libs:web3j-extensions')
8+
implementation project(':jvm-libs:generic:vertx-helper')
9+
implementation project(':jvm-libs:generic:extensions:futures')
10+
implementation project(':jvm-libs:linea:web3j-extensions')
1111
implementation project(':coordinator:utilities')
1212
implementation project(':coordinator:core')
1313
implementation project(':coordinator:clients:smart-contract-client')

‎coordinator/ethereum/models-helper/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44

55
dependencies {
66
api (project(":coordinator:core"))
7-
api project(":jvm-libs:teku-execution-client")
7+
api project(":jvm-libs:linea:teku-execution-client")
88
implementation "org.hyperledger.besu:besu-datatypes:${libs.versions.besu.get()}"
99
implementation "org.hyperledger.besu:evm:${libs.versions.besu.get()}"
1010
implementation "org.hyperledger.besu.internal:rlp:${libs.versions.besu.get()}"
1111
implementation "org.hyperledger.besu.internal:core:${libs.versions.besu.get()}"
1212

13-
testImplementation project(":jvm-libs:testing-teku-helper")
13+
testImplementation project(":jvm-libs:linea:testing:teku-helper")
1414
}

‎coordinator/ethereum/test-utils/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ plugins {
88
dependencies {
99
implementation(project(":coordinator:core"))
1010
implementation(project(":coordinator:clients:smart-contract-client"))
11-
implementation(project(":jvm-libs:web3j-extensions"))
11+
implementation(project(":jvm-libs:linea:web3j-extensions"))
1212
implementation(project(":coordinator:ethereum:common"))
13-
implementation(project(":jvm-libs:testing:file-system"))
13+
implementation(project(":jvm-libs:linea:testing:file-system"))
1414
implementation("org.web3j:core:${libs.versions.web3j.get()}") {
1515
exclude group: 'org.slf4j', module: 'slf4j-nop'
1616
}

‎coordinator/persistence/aggregation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
testImplementation(project(":coordinator:persistence:blob"))
1313
testImplementation(testFixtures(project(":coordinator:persistence:db")))
1414
testImplementation(testFixtures(project(":coordinator:core")))
15-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
15+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
1616
testImplementation("io.vertx:vertx-junit5")
1717
}
1818

‎coordinator/persistence/batch/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ plugins {
77
dependencies {
88
api(project(":coordinator:core"))
99
implementation(project(":coordinator:persistence:db"))
10-
implementation(project(":jvm-libs:core:metrics"))
10+
implementation(project(":jvm-libs:linea:core:metrics"))
1111
implementation(project(":coordinator:clients:prover-client:file-based-client")) {
1212
because "ProverResponseIndex is a part of it"
1313
}
1414

1515
testImplementation(testFixtures(project(":coordinator:core")))
1616
testImplementation(testFixtures(project(":coordinator:persistence:db")))
17-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
17+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
1818
testImplementation("io.vertx:vertx-junit5")
1919

2020
testFixturesImplementation(testFixtures(project(":coordinator:persistence:db")))

‎coordinator/persistence/blob/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
testImplementation("tech.pegasys.teku.internal:executionclient:${libs.versions.teku.get()}")
1818
testImplementation(testFixtures(project(":coordinator:persistence:db")))
1919
testImplementation(testFixtures(project(":coordinator:core")))
20-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
20+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
2121
testImplementation("io.vertx:vertx-junit5")
2222

2323
testFixturesImplementation('tech.pegasys.teku.internal:async:23.1.1')

‎coordinator/persistence/db/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
because("Flyway DB and other dependencies use SLF4J")
1919
}
2020

21-
testImplementation testFixtures(project(':jvm-libs:kotlin-extensions'))
21+
testImplementation testFixtures(project(':jvm-libs:generic:extensions:kotlin'))
2222
testFixturesApi(platform("org.junit:junit-bom:${libs.versions.junit.get()}"))
2323
testFixturesApi("io.vertx:vertx-junit5:${libs.versions.vertx.get()}")
2424
}

‎coordinator/persistence/feehistory/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}")
1616
testImplementation("tech.pegasys.teku.internal:executionclient:${libs.versions.teku.get()}")
1717
testImplementation(testFixtures(project(":coordinator:persistence:db")))
18-
testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
18+
testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
1919
testImplementation("io.vertx:vertx-junit5")
2020
}
2121

‎coordinator/utilities/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
}
44

55
dependencies {
6-
implementation project(':jvm-libs:future-extensions')
7-
implementation project(':jvm-libs:errors')
6+
implementation project(':jvm-libs:generic:extensions:futures')
7+
implementation project(':jvm-libs:generic:errors')
88
implementation "org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinxDatetime.get()}"
99
implementation "io.vertx:vertx-core"
1010
implementation "com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}"
@@ -14,7 +14,7 @@ dependencies {
1414

1515
testImplementation "org.junit.jupiter:junit-jupiter"
1616
testImplementation "io.vertx:vertx-junit5"
17-
testImplementation testFixtures(project(':jvm-libs:kotlin-extensions'))
17+
testImplementation testFixtures(project(':jvm-libs:generic:extensions:kotlin'))
1818
}
1919

2020
test {

‎finalized-tag-updater/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ dependencies {
3636
compileOnly 'info.picocli:picocli:4.7.6'
3737
compileOnly 'io.vertx:vertx-core'
3838

39-
implementation project(":jvm-libs:kotlin-extensions")
40-
implementation project(':jvm-libs:core:long-running-service')
41-
implementation project(':jvm-libs:future-extensions')
42-
implementation project(':jvm-libs:web3j-extensions')
39+
implementation project(":jvm-libs:generic:extensions:kotlin")
40+
implementation project(':jvm-libs:linea:core:long-running-service')
41+
implementation project(':jvm-libs:generic:extensions:futures')
42+
implementation project(':jvm-libs:linea:web3j-extensions')
4343
implementation 'build.linea:l1-rollup-contract-client:0.0.1'
4444
implementation ("org.web3j:core:${libs.versions.web3j.get()}") {
4545
exclude group: 'org.slf4j', module: 'slf4j-nop'

‎jvm-libs/errors/build.gradle renamed to ‎jvm-libs/generic/errors/build.gradle

File renamed without changes.

‎jvm-libs/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt renamed to ‎jvm-libs/generic/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt

File renamed without changes.

‎jvm-libs/future-extensions/build.gradle renamed to ‎jvm-libs/generic/extensions/futures/build.gradle

File renamed without changes.

‎jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt renamed to ‎jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt

File renamed without changes.

‎jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt renamed to ‎jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt

File renamed without changes.

‎jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/Future.kt renamed to ‎jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/Future.kt

File renamed without changes.

‎jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt renamed to ‎jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt

File renamed without changes.

‎jvm-libs/future-extensions/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt renamed to ‎jvm-libs/generic/extensions/futures/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/build.gradle renamed to ‎jvm-libs/generic/extensions/kotlin/build.gradle

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/ByteArrayExtensions.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/CollectionsExtensions.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/InstantExtensions.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/MathExtensions.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/TypingsExtensions.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/InstantExtensionsTest.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/MathExtensionsTest.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt

File renamed without changes.

‎jvm-libs/kotlin-extensions/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt renamed to ‎jvm-libs/generic/extensions/kotlin/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt

File renamed without changes.

‎jvm-libs/http-rest/build.gradle renamed to ‎jvm-libs/generic/http-rest/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
}
44

55
dependencies {
6-
implementation project(":jvm-libs:errors")
7-
implementation project(':jvm-libs:future-extensions')
8-
implementation project(":jvm-libs:metrics:micrometer")
6+
implementation project(":jvm-libs:generic:errors")
7+
implementation project(':jvm-libs:generic:extensions:futures')
8+
implementation project(":jvm-libs:linea:metrics:micrometer")
99
implementation "io.vertx:vertx-core"
1010
implementation "io.vertx:vertx-web-client"
1111

‎jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt renamed to ‎jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt

File renamed without changes.

‎jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt renamed to ‎jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt

File renamed without changes.

‎jvm-libs/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt renamed to ‎jvm-libs/generic/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt

File renamed without changes.

0 commit comments

Comments
 (0)