diff --git a/build.gradle.kts b/build.gradle.kts index bd38fc9de..30c3e2594 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,7 +72,7 @@ subprojects { // Only apply if the project has the kotlin plugin added: plugins.withType { - tasks.withType { + tasks.withType().configureEach { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() freeCompilerArgs = listOf("-Xjvm-default=all-compatibility") @@ -80,9 +80,9 @@ subprojects { // dependsOn("spotlessKotlinApply") } - tasks.withType { - sourceCompatibility = JavaVersion.VERSION_11.toString() - targetCompatibility = JavaVersion.VERSION_11.toString() + configure { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } dependencies { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 906ba90f7..000000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - kotlin("jvm") version "1.9.23" -} - -repositories { - jcenter() -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d02755f40..fae7dfd8d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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 diff --git a/tempest-dynamodb-local/build.gradle.kts b/tempest-dynamodb-local/build.gradle.kts index 95daf70dc..195c311e4 100644 --- a/tempest-dynamodb-local/build.gradle.kts +++ b/tempest-dynamodb-local/build.gradle.kts @@ -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()