Skip to content

Commit 1123778

Browse files
committed
chore: bump version to 1.3.1 and improve GenerateExposedMigrationScript task configuration
1 parent e1cd282 commit 1123778

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

surf-api-gradle-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
group = groupId
2121
version = buildString {
2222
append(mcVersion)
23-
append("-1.3.0")
23+
append("-1.3.1")
2424
if (snapshot) append("-SNAPSHOT")
2525
}
2626

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/core/tasks/GenerateExposedMigrationScript.kt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,32 @@ import org.gradle.api.Project
66
import org.gradle.api.tasks.JavaExec
77
import org.gradle.api.tasks.SourceSet
88
import org.gradle.api.tasks.SourceSetContainer
9-
import org.gradle.kotlin.dsl.named
10-
import org.gradle.kotlin.dsl.register
9+
import org.gradle.kotlin.dsl.*
1110
import java.util.*
1211

1312

1413
val Project.sourceSets: SourceSetContainer get() = this.extensions.getByName("sourceSets") as SourceSetContainer
1514
val SourceSetContainer.main: NamedDomainObjectProvider<SourceSet> get() = named<SourceSet>("main")
1615

1716
fun Project.generateExposedMigrationScript(cloudRuntimeDependency: String, mainClass: String) {
18-
val additionalDependencies = configurations.detachedConfiguration(
19-
dependencies.create(cloudRuntimeDependency)
20-
)
17+
val migrationRuntimeClasspath = configurations.create("migrationRuntimeClasspath") {
18+
extendsFrom(
19+
configurations["runtimeClasspath"].copyRecursive().apply { isCanBeResolved = false })
20+
isCanBeResolved = true
21+
exclude("org.apache.logging.log4j", "log4j-slf4j2-impl")
22+
}
23+
24+
dependencies {
25+
migrationRuntimeClasspath(cloudRuntimeDependency)
26+
}
2127

2228
tasks.register<JavaExec>("generateExposedMigrationScript") {
2329
group = "migration"
2430
description = "Generate Exposed migration script"
25-
classpath = sourceSets.main.get().runtimeClasspath + additionalDependencies
31+
classpath = files(
32+
sourceSets.main.get().output,
33+
migrationRuntimeClasspath
34+
)
2635
this.mainClass.set(mainClass)
2736

2837
val properties = project.file("migration.properties")

0 commit comments

Comments
 (0)