Skip to content

Commit 75dcf97

Browse files
authored
Merge pull request #340 from domaframework/renovate/org.domaframework.doma.compile-4.x
Update plugin doma-compile to v4
2 parents 83f0665 + 8d6f4ec commit 75dcf97

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ subprojects {
4747
apply(plugin = "java")
4848
apply(plugin = catalog.plugins.eclipse.apt.get().pluginId)
4949
apply(plugin = catalog.plugins.spotless.get().pluginId)
50-
apply(plugin = catalog.plugins.doma.compile.get().pluginId)
5150

5251
java {
5352
toolchain {
@@ -58,6 +57,8 @@ subprojects {
5857
tasks {
5958
withType<JavaCompile> {
6059
options.encoding = "UTF-8"
60+
// TODO Remove this workaround
61+
options.compilerArgs.add("-Adoma.resources.dir=" + sourceSets["main"].resources.srcDirs.first().absolutePath)
6162
}
6263

6364
withType<Test> {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version = "1.5.0" }
2525

2626
[plugins]
2727
spotless = { id = "com.diffplug.spotless", version = "7.0.3" }
28-
doma-compile = { id = "org.domaframework.doma.compile", version = "3.0.1" }
28+
doma-compile = { id = "org.domaframework.doma.compile", version = "4.0.0" }
2929
eclipse-apt = { id = "com.diffplug.eclipse.apt", version = "4.3.0" }

0 commit comments

Comments
 (0)