Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/gradle
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ buildscript {
classpath(libs.junitGradlePlugin)
classpath(libs.kotlinGradlePlugin)
classpath(libs.mavenPublishGradlePlugin)
classpath(libs.shadowGradlePlugin)
classpath(libs.wireGradlePlugin)
}
}
Expand Down
31 changes: 28 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
[versions]
aws2 = "2.31.30"
jackson = "2.14.3"
jetty = "12.0.9"
ktlint = "0.40.0"
kotlin = "1.9.23"
sqlite4java = "1.0.392"

[libraries]
antlr4Runtime = { module = "org.antlr:antlr4-runtime", version = "4.13.2" }
assertj = { module = "org.assertj:assertj-core", version = "3.23.1" }
aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version = "2.25.11" }
aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version = "2.25.11" }
awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.11.960" }
aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "aws2" }
aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version.ref = "aws2" }
aws2Pinpoint = { module = "software.amazon.awssdk:pinpoint", version.ref = "aws2" } # for DynamoDBLocal
awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.782" }
awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "2.6.0" }
clikt = { module = "com.github.ajalt:clikt", version = "2.8.0" }
commonsCli = { module = "commons-cli:commons-cli", version = "1.9.0" } # for DynamoDBLocal
commonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" } # for DynamoDBLocal
dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" }
dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.2.13" }
dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.2.13" }
findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
guava = { module = "com.google.guava:guava", version = "31.0.1-jre" }
jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } # for DynamoDBLocal
jacksonDatatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } # for DynamoDBLocal
jettyAlpnClient = { module = "org.eclipse.jetty:jetty-alpn-client", version.ref = "jetty" } # for DynamoDBLocal
jettyClient = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty" } # for DynamoDBLocal
jettyServer = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } # for DynamoDBLocal
junit4Api = { module = "junit:junit", version = "4.13.2" }
junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.8.2" }
junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.11.4" }
Expand All @@ -32,4 +45,16 @@ moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version = "1.15.2" }
nettyBom = { module = "io.netty:netty-bom", version = "4.1.79.Final" }
okio = { module = "com.squareup.okio:okio", version = "3.4.0" }
okioFakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version = "3.4.0" }
shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.6" }
slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.17" } # for DynamoDBLocal
sqlite4javaLinuxI386 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-i386", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaLinuxAmd64 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-amd64", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaOsx = { module = "com.almworks.sqlite4java:libsqlite4java-osx", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaWinX64 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x64", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaWinX86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x86", version.ref = "sqlite4java" } # for DynamoDBLocal
wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.8.1" }

[bundles]
jackson = ["jacksonDatabind", "jacksonDatatypeJsr310"]
jetty = ["jettyAlpnClient", "jettyClient", "jettyServer"]
sqlite4java = ["sqlite4javaLinuxI386", "sqlite4javaLinuxAmd64", "sqlite4javaOsx", "sqlite4javaWinX64", "sqlite4javaWinX86"]
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include("tempest-internal")
include("tempest")
include("tempest-bom")
include("tempest-docker")
include("tempest-dynamodb-local")
include("tempest-testing")
include("tempest-testing-internal")
include("tempest-testing-docker")
Expand Down
73 changes: 73 additions & 0 deletions tempest-dynamodb-local/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
`java-library`
id("com.gradleup.shadow")
id("com.vanniktech.maven.publish.base")
}

dependencies {
// Ignore transtive dependencies and insyead manage explicitly.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: insyead

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed!

implementation(libs.awsDynamodbLocal) {
isTransitive = false
}

// Implementation dependencies will be shaded in the JAR.
implementation(libs.bundles.jackson)
implementation(libs.bundles.jetty)
implementation(libs.kotlinStdLib)

// Shadow dependencies will not be shaded.
shadow(libs.antlr4Runtime)
shadow(libs.aws2Dynamodb)
shadow(libs.aws2DynamodbEnhanced)
shadow(libs.aws2Pinpoint)
shadow(libs.awsDynamodb)
shadow(libs.commonsCli)
shadow(libs.commonsLang3)
shadow(libs.guava)
shadow(libs.slf4jApi)
shadow(libs.bundles.sqlite4java)
}

tasks.shadowJar {
// Dependencies to be shaded must be explicitly included as dependencies.
dependencies {
include(dependency("com.amazonaws:DynamoDBLocal"))
include(dependency("com.fasterxml.jackson.core:.*"))
include(dependency("com.fasterxml.jackson.dataformat:.*"))
include(dependency("com.fasterxml.jackson.datatype:.*"))
include(dependency("com.fasterxml.jackson.module:.*"))
include(dependency("org.eclipse.jetty:.*"))
}

// Relocate packages to avoid conflicts.
relocate("com.amazon.dynamodb.grammar", "shaded.com.amazon.dynamodb.grammar")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: it might be better to use a more unique prefix, like tempest.shaded rather than shaded. In case somebody else is also shading these classes and some poor downstream consumer gets both copies

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, added a project-specific prefix to the package name.

relocate("com.amazon.ion", "shaded.com.amazon.ion")
relocate("com.amazonaws.services.dynamodbv2.dataMembers", "shaded.com.amazonaws.services.dynamodbv2.dataMembers")
relocate("com.amazonaws.services.dynamodbv2.datamodel", "shaded.com.amazonaws.services.dynamodbv2.datamodel")
relocate("com.amazonaws.services.dynamodbv2.dbenv", "shaded.com.amazonaws.services.dynamodbv2.dbenv")
relocate("com.amazonaws.services.dynamodbv2.exceptions", "shaded.com.amazonaws.services.dynamodbv2.exceptions")
relocate("com.amazonaws.services.dynamodbv2.local", "shaded.com.amazonaws.services.dynamodbv2.local")
relocate("com.fasterxml.jackson", "shaded.com.fasterxml.jackson")
relocate("ddb.partiql", "shaded.ddb.partiql")
relocate("kotlin", "shaded.kotlin")
relocate("org.eclipse.jetty", "shaded.org.eclipse.jetty")
relocate("org.partiql", "shaded.org.partiql")

mergeServiceFiles()

// Publish shadow JAR as the main JAR.
archiveClassifier = ""
}

configure<MavenPublishBaseExtension> {
configure(
JavaLibrary(
javadocJar = JavadocJar.Empty(),
sourcesJar = false,
)
)
}
18 changes: 9 additions & 9 deletions tempest-testing-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("jvm")
`java-library`
kotlin("jvm")
`java-library`
id("com.vanniktech.maven.publish.base")
}

dependencies {
api(project(":tempest-testing"))
implementation(project(":tempest-testing-internal"))
implementation(libs.awsDynamodbLocal)
implementation(libs.kotlinStdLib)
api(project(":tempest-testing"))
implementation(project(":tempest-testing-internal"))
implementation(project(path = ":tempest-dynamodb-local", configuration = "shadow"))
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

package app.cash.tempest.testing

import com.amazonaws.services.dynamodbv2.local.main.ServerRunner
import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
import shaded.com.amazonaws.services.dynamodbv2.local.main.ServerRunner
import shaded.com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
import com.google.common.util.concurrent.AbstractIdleService
import java.io.File

class JvmDynamoDbServer private constructor(
override val port: Int,
Expand Down
2 changes: 1 addition & 1 deletion tempest2-testing-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
dependencies {
api(project(":tempest2-testing"))
implementation(project(":tempest2-testing-internal"))
implementation(libs.awsDynamodbLocal)
implementation(project(path = ":tempest-dynamodb-local", configuration = "shadow"))
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

package app.cash.tempest2.testing

import com.amazonaws.services.dynamodbv2.local.main.ServerRunner
import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
import shaded.com.amazonaws.services.dynamodbv2.local.main.ServerRunner
import shaded.com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
import com.google.common.util.concurrent.AbstractIdleService
import java.io.File

class JvmDynamoDbServer private constructor(
override val port: Int,
Expand Down
Loading