Skip to content

Commit 299ab73

Browse files
committed
rename azuremanaged module names to avoid colliding module names named "client", gradle expects unique module names and build one module only if colliding names
1 parent f23edcc commit 299ab73

File tree

15 files changed

+49
-9
lines changed

15 files changed

+49
-9
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ repositories {
2929
}
3030

3131
dependencies {
32+
implementation project(':client')
3233
implementation project(':azuremanaged:shared')
3334
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3435
implementation "io.grpc:grpc-stub:${grpcVersion}"
3536
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
3637

37-
implementation "com.microsoft:durabletask-client:${durabletaskClientVersion}"
38+
// implementation "com.microsoft:durabletask-client:${durabletaskClientVersion}"
3839
implementation "com.azure:azure-core:${azureCoreVersion}"
3940
implementation "com.azure:azure-identity:${azureIdentityVersion}"
4041

azuremanaged/client/src/main/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientExtensions.java renamed to azuremanaged/dtclient/src/main/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientExtensions.java

File renamed without changes.

azuremanaged/client/src/main/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientOptions.java renamed to azuremanaged/dtclient/src/main/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientOptions.java

File renamed without changes.

azuremanaged/client/src/test/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java renamed to azuremanaged/dtclient/src/test/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java

File renamed without changes.

azuremanaged/client/src/test/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientOptionsTest.java renamed to azuremanaged/dtclient/src/test/java/com/microsoft/durabletask/client/azuremanaged/DurableTaskSchedulerClientOptionsTest.java

File renamed without changes.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ repositories {
3030

3131
dependencies {
3232
implementation project(':azuremanaged:shared')
33+
implementation project(':client')
3334
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3435
implementation "io.grpc:grpc-stub:${grpcVersion}"
35-
implementation "com.microsoft:durabletask-client:${durabletaskClientVersion}"
36+
// implementation "com.microsoft:durabletask-client:${durabletaskClientVersion}"
3637
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
3738
implementation "com.azure:azure-core:${azureCoreVersion}"
3839
implementation "com.azure:azure-identity:${azureIdentityVersion}"

azuremanaged/worker/src/main/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerExtensions.java renamed to azuremanaged/dtworker/src/main/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerExtensions.java

File renamed without changes.

azuremanaged/worker/src/main/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerOptions.java renamed to azuremanaged/dtworker/src/main/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerOptions.java

File renamed without changes.

azuremanaged/worker/src/test/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java renamed to azuremanaged/dtworker/src/test/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java

File renamed without changes.

azuremanaged/worker/src/test/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerOptionsTest.java renamed to azuremanaged/dtworker/src/test/java/com/microsoft/durabletask/worker/azuremanaged/DurableTaskSchedulerWorkerOptionsTest.java

File renamed without changes.

0 commit comments

Comments
 (0)