Skip to content

chore: simplify shadowJar config. #232

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: simplify shadowJar config. #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
006b685
chore: delete buildSrc -- it did nothing.
autonomousapps May 7, 2025
4993c83
chore: simplify shadowJar config.
autonomousapps May 7, 2025
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
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ subprojects {

// Only apply if the project has the kotlin plugin added:
plugins.withType<KotlinPluginWrapper> {
tasks.withType<KotlinCompile> {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
}
// dependsOn("spotlessKotlinApply")
}

tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
Comment on lines -83 to 86
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The change is to configure the java {} extension instead, which expresses the intent better and also works against the latest pre-release version of Shadow (9.0.0-beta13).


dependencies {
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/build.gradle.kts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ 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" }
shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "9.0.0-beta13" }
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
Expand Down
19 changes: 2 additions & 17 deletions tempest-dynamodb-local/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,8 @@ tasks.shadowJar {
}

// Relocate packages to avoid conflicts.
listOf(
"com.amazon.dynamodb.grammar",
"com.amazon.ion",
"com.amazonaws.services.dynamodbv2.dataMembers",
"com.amazonaws.services.dynamodbv2.datamodel",
"com.amazonaws.services.dynamodbv2.dbenv",
"com.amazonaws.services.dynamodbv2.exceptions",
"com.amazonaws.services.dynamodbv2.local",
"com.amazonaws.services.dynamodbv2.parser",
"com.amazonaws.services.dynamodbv2.rr",
"com.fasterxml.jackson",
"ddb.partiql",
"kotlin",
"org.antlr",
"org.eclipse.jetty",
"org.partiql",
).forEach { relocate(it, "app.cash.tempest.testing.dynamodb.local.shaded.${it}") }
enableRelocation = true
relocationPrefix = "app.cash.tempest.testing.dynamodb.local.shaded"

mergeServiceFiles()

Expand Down