Skip to content

Commit eea6a34

Browse files
kingsword09kingsword09
committed
🐛 修复编译异常
1 parent 8009e54 commit eea6a34

10 files changed

Lines changed: 36 additions & 46 deletions

File tree

‎rust_library/biometrics/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustPosixTarget
88
import gobley.gradle.rust.targets.RustWindowsTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1110

1211
plugins {
@@ -93,7 +92,9 @@ uniffi {
9392

9493
tasks.named("compileKotlinDesktop") {
9594
doFirst {
96-
projectDir.resolve("src").deleteRecursively()
95+
if (!project.isPublish) {
96+
projectDir.resolve("src").deleteRecursively()
97+
}
9798
}
9899
doLast {
99100
copyDirectoryToTarget(

‎rust_library/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ tasks.register("win-rust-resources-unzip") {
8585
)
8686
}
8787
}
88+
89+
val unzipDir = rootDir.resolve(".kotlin").resolve(arch)
90+
if(unzipDir.exists()) {
91+
unzipDir.deleteRecursively()
92+
}
8893
}
8994
}
9095
}

‎rust_library/buildSrc/src/main/kotlin/Extension.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ fun Properties.copyTo(outProperties: MutableMap<String, Any>) {
2828
}
2929
}
3030
}
31+
32+
val Project.isPublish: Boolean
33+
get() = gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
34+

‎rust_library/hardware_info/build.gradle.kts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustPosixTarget
88
import gobley.gradle.rust.targets.RustWindowsTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1110

1211
plugins {
@@ -23,9 +22,6 @@ plugins.withId("publish-plugin") {
2322
project.version = "1.2.0"
2423
}
2524

26-
val isPublish =
27-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
28-
2925
kotlin {
3026
jvm("desktop")
3127
jvmToolchain {
@@ -84,7 +80,9 @@ uniffi {
8480

8581
tasks.named("compileKotlinDesktop") {
8682
doFirst {
87-
projectDir.resolve("src").deleteRecursively()
83+
if (!project.isPublish) {
84+
projectDir.resolve("src").deleteRecursively()
85+
}
8886
}
8987
doLast {
9088
copyDirectoryToTarget(

‎rust_library/keychainstore/build.gradle.kts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustPosixTarget
88
import gobley.gradle.rust.targets.RustWindowsTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1110

1211
plugins {
@@ -23,10 +22,6 @@ plugins.withId("publish-plugin") {
2322
project.version = "1.2.0"
2423
}
2524

26-
val isPublish =
27-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
28-
29-
3025
kotlin {
3126
jvm("desktop")
3227

@@ -111,7 +106,9 @@ uniffi {
111106

112107
tasks.named("compileKotlinDesktop") {
113108
doFirst {
114-
projectDir.resolve("src").deleteRecursively()
109+
if (!project.isPublish) {
110+
projectDir.resolve("src").deleteRecursively()
111+
}
115112
}
116113
doLast {
117114
copyDirectoryToTarget(
@@ -155,7 +152,7 @@ tasks.named("gen-bindings") {
155152
project.afterEvaluate {
156153
tasks.named("buildBindings") {
157154
doLast {
158-
if (isPublish) {
155+
if (project.isPublish) {
159156
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
160157
if (it.path.contains("Main")) {
161158
it.deleteRecursively()

‎rust_library/mix_compression/build.gradle.kts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustAndroidTarget
88
import gobley.gradle.rust.targets.RustPosixTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.gradle.kotlin.dsl.support.serviceOf
1110
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1211
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -27,10 +26,6 @@ plugins.withId("publish-plugin") {
2726
project.version = "1.2.0"
2827
}
2928

30-
val isPublish =
31-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
32-
33-
3429
kotlin {
3530
androidTarget {
3631
publishLibraryVariants("release")
@@ -132,7 +127,9 @@ uniffi {
132127

133128
tasks.named("compileKotlinDesktop") {
134129
doFirst {
135-
projectDir.resolve("src").deleteRecursively()
130+
if (!project.isPublish) {
131+
projectDir.resolve("src").deleteRecursively()
132+
}
136133
}
137134
doLast {
138135
copyDirectoryToTarget(
@@ -181,7 +178,7 @@ tasks.named("gen-bindings") {
181178
project.afterEvaluate {
182179
tasks.named("buildBindings") {
183180
doLast {
184-
if (isPublish) {
181+
if (project.isPublish) {
185182
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
186183
if (it.path.contains("Main")) {
187184
it.deleteRecursively()

‎rust_library/multipart/build.gradle.kts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustAndroidTarget
88
import gobley.gradle.rust.targets.RustPosixTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.gradle.kotlin.dsl.support.serviceOf
1110
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1211
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -27,10 +26,6 @@ plugins.withId("publish-plugin") {
2726
project.version = "1.2.0"
2827
}
2928

30-
val isPublish =
31-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
32-
33-
3429
kotlin {
3530
androidTarget {
3631
publishLibraryVariants("release")
@@ -131,7 +126,9 @@ uniffi {
131126

132127
tasks.named("compileKotlinDesktop") {
133128
doFirst {
134-
projectDir.resolve("src").deleteRecursively()
129+
if (!project.isPublish) {
130+
projectDir.resolve("src").deleteRecursively()
131+
}
135132
}
136133
doLast {
137134
copyDirectoryToTarget(
@@ -180,7 +177,7 @@ tasks.named("gen-bindings") {
180177
project.afterEvaluate {
181178
tasks.named("buildBindings") {
182179
doLast {
183-
if (isPublish) {
180+
if (project.isPublish) {
184181
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
185182
if (it.path.contains("Main")) {
186183
it.deleteRecursively()

‎rust_library/resvg_render/build.gradle.kts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustAndroidTarget
88
import gobley.gradle.rust.targets.RustPosixTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.gradle.kotlin.dsl.support.serviceOf
1110
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1211
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -27,10 +26,6 @@ plugins.withId("publish-plugin") {
2726
project.version = "1.2.0"
2827
}
2928

30-
val isPublish =
31-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
32-
33-
3429
kotlin {
3530
androidTarget {
3631
publishLibraryVariants("release")
@@ -132,7 +127,9 @@ uniffi {
132127

133128
tasks.named("compileKotlinDesktop") {
134129
doFirst {
135-
projectDir.resolve("src").deleteRecursively()
130+
if (!project.isPublish) {
131+
projectDir.resolve("src").deleteRecursively()
132+
}
136133
}
137134
doLast {
138135
copyDirectoryToTarget(
@@ -181,7 +178,7 @@ tasks.named("gen-bindings") {
181178
project.afterEvaluate {
182179
tasks.named("buildBindings") {
183180
doLast {
184-
if (isPublish) {
181+
if (project.isPublish) {
185182
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
186183
if (it.path.contains("Main")) {
187184
it.deleteRecursively()

‎rust_library/reverse_proxy/build.gradle.kts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import gobley.gradle.GobleyHost
44
import gobley.gradle.InternalGobleyGradleApi
55
import gobley.gradle.Variant
66
import gobley.gradle.rust.targets.RustAndroidTarget
7-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
87
import org.gradle.kotlin.dsl.support.serviceOf
98
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
109
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -26,9 +25,6 @@ plugins.withId("publish-plugin") {
2625
project.version = "1.2.0"
2726
}
2827

29-
val isPublish =
30-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
31-
3228
kotlin {
3329
androidTarget {
3430
publishLibraryVariants("release")
@@ -154,7 +150,7 @@ tasks.named("gen-bindings") {
154150
project.afterEvaluate {
155151
tasks.named("buildBindings") {
156152
doLast {
157-
if (isPublish) {
153+
if (project.isPublish) {
158154
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
159155
if (it.path.contains("Main")) {
160156
it.deleteRecursively()

‎rust_library/ziplib/build.gradle.kts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import gobley.gradle.Variant
66
import gobley.gradle.cargo.dsl.jvm
77
import gobley.gradle.rust.targets.RustAndroidTarget
88
import gobley.gradle.rust.targets.RustPosixTarget
9-
import gobley.gradle.uniffi.tasks.BuildBindingsTask
109
import org.gradle.kotlin.dsl.support.serviceOf
1110
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
1211
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -27,9 +26,6 @@ plugins.withId("publish-plugin") {
2726
project.version = "1.2.0"
2827
}
2928

30-
val isPublish =
31-
gradle.startParameter.taskNames.any { it.endsWith("publish") || it.endsWith("publishToMavenLocal") }
32-
3329
kotlin {
3430
androidTarget {
3531
publishLibraryVariants("release")
@@ -128,7 +124,9 @@ uniffi {
128124

129125
tasks.named("compileKotlinDesktop") {
130126
doFirst {
131-
projectDir.resolve("src").deleteRecursively()
127+
if (!project.isPublish) {
128+
projectDir.resolve("src").deleteRecursively()
129+
}
132130
}
133131
doLast {
134132
copyDirectoryToTarget(
@@ -177,7 +175,7 @@ tasks.named("gen-bindings") {
177175
project.afterEvaluate {
178176
tasks.named("buildBindings") {
179177
doLast {
180-
if (isPublish) {
178+
if (project.isPublish) {
181179
projectDir.resolve("build").resolve("generated").resolve("uniffi").listFiles().forEach {
182180
if (it.path.contains("Main")) {
183181
it.deleteRecursively()

0 commit comments

Comments
 (0)