Skip to content

Commit 66a7dc5

Browse files
authored
Merge pull request #61 from sourceplusplus/dev
v0.5.0
2 parents 0708f8e + e707686 commit 66a7dc5

File tree

2 files changed

+7
-49
lines changed

2 files changed

+7
-49
lines changed

build.gradle.kts

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.apache.tools.ant.taskdefs.condition.Os
2-
31
plugins {
42
kotlin("multiplatform")
53
kotlin("plugin.serialization")
@@ -86,54 +84,14 @@ dependencies {
8684
"kapt"("io.vertx:vertx-codegen:$vertxVersion:processor")
8785
}
8886

89-
tasks.register<Copy>("setupJsonMappers") {
90-
from(file("$projectDir/src/jvmMain/resources/META-INF/vertx/json-mappers.properties"))
91-
into(file("$buildDir/generated/source/kapt/main/META-INF/vertx"))
92-
}
93-
tasks.getByName("compileKotlinJvm").dependsOn("setupJsonMappers")
94-
95-
tasks.register<Exec>("restrictDeletionOfJsonMappers") {
96-
mustRunAfter("setupJsonMappers")
97-
doFirst {
98-
if (!Os.isFamily(Os.FAMILY_UNIX)) {
99-
ProcessBuilder(
100-
"cmd.exe", "/C",
101-
"start \"\" notepad >> $buildDir\\generated\\source\\kapt\\main\\META-INF\\vertx\\json-mappers.properties"
102-
).start()
103-
}
104-
}
105-
if (Os.isFamily(Os.FAMILY_UNIX)) {
106-
if (System.getProperty("user.name") == "root") {
107-
commandLine("chattr", "+i", "$buildDir/generated/source/kapt/main/META-INF/vertx")
108-
} else {
109-
commandLine("chmod", "a-w", "$buildDir/generated/source/kapt/main/META-INF/vertx")
110-
}
111-
} else {
112-
executable("cmd.exe")
113-
args("/C") //no-op
114-
}
115-
}
116-
tasks.getByName("compileKotlinJvm").dependsOn("restrictDeletionOfJsonMappers")
117-
118-
tasks.register<Exec>("unrestrictDeletionOfJsonMappers") {
119-
mustRunAfter("compileKotlinJvm")
120-
if (Os.isFamily(Os.FAMILY_UNIX)) {
121-
if (file("$buildDir/generated/source/kapt/main/META-INF/vertx").exists()) {
122-
if (System.getProperty("user.name") == "root") {
123-
commandLine("chattr", "-i", "$buildDir/generated/source/kapt/main/META-INF/vertx")
124-
} else {
125-
commandLine("chmod", "a+w", "$buildDir/generated/source/kapt/main/META-INF/vertx")
126-
}
127-
} else {
128-
commandLine("true") //no-op
87+
project.tasks.all {
88+
copy {
89+
doFirst {
90+
file("$projectDir/src/jvmMain/resources/META-INF/vertx/json-mappers.properties")
91+
.copyTo(file("$buildDir/generated/source/kapt/main/META-INF/vertx/json-mappers.properties"), overwrite = true)
12992
}
130-
} else {
131-
executable("cmd.exe")
132-
args("/C") //no-op
13393
}
13494
}
135-
tasks.getByName("jvmJar").dependsOn("unrestrictDeletionOfJsonMappers")
136-
tasks.getByName("clean").dependsOn("unrestrictDeletionOfJsonMappers")
13795

13896
configure<org.jetbrains.kotlin.noarg.gradle.NoArgExtension> {
13997
annotation("kotlinx.serialization.Serializable")

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
kotlin.code.style=official
22

3-
projectVersion=0.4.7
3+
projectVersion=0.5.0
44

55
kotlinVersion=1.6.10
6-
vertxVersion=4.2.6
6+
vertxVersion=4.3.0
77
jacksonVersion=2.13.1
88
slf4jVersion=1.7.33

0 commit comments

Comments
 (0)