diff --git a/car/build.gradle b/car/build.gradle
index d0455dc..519d040 100644
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -16,7 +16,8 @@ task copyPythonCode(type: Copy, dependsOn: configurations.python){
 }
 
 task build(type: Exec, dependsOn: copyPythonCode) {
-    commandLine 'python3', 'setup.py', 'bdist_wheel'
+    executable 'python3'
+    args 'setup.py', 'bdist_wheel'
 }
 
 task clean {
diff --git a/car/requirements.txt b/car/requirements.txt
index 03863bb..f27a941 100644
--- a/car/requirements.txt
+++ b/car/requirements.txt
@@ -5,4 +5,5 @@ paho-mqtt
 u-msgpack-python
 grpcio-tools
 rplidar
-pyzmq
\ No newline at end of file
+pyzmq
+wheel
\ No newline at end of file
diff --git a/protobuf/build.gradle b/protobuf/build.gradle
index a8e7b78..a5010e5 100644
--- a/protobuf/build.gradle
+++ b/protobuf/build.gradle
@@ -22,17 +22,19 @@ configurations {
 protobuf {
     protoc { artifact = 'com.google.protobuf:protoc:3.11.0' }
     plugins {
-        swift {
-            path = "$projectDir/grpc_plugins/protoc-gen-swift"
-        }
         grpc {
             artifact = 'io.grpc:protoc-gen-grpc-java:1.28.1' // CURRENT_GRPC_VERSION
         }
         grpc_python {
             path = "$projectDir/grpc_plugins/grpc_python_plugin_1.28.1-${osdetector.classifier}"
         }
-        grpc_swift {
-            path = "$projectDir/grpc_plugins/protoc-gen-grpc-swift-$osdetector.classifier"
+        if(osdetector.os != 'windows'){
+            swift {
+                path = "$projectDir/grpc_plugins/protoc-gen-swift"
+            }
+            grpc_swift {
+                path = "$projectDir/grpc_plugins/protoc-gen-grpc-swift-$osdetector.classifier"
+            }
         }
     }
     generateProtoTasks {
@@ -43,15 +45,17 @@ protobuf {
                 python {}
             }
             task.plugins {
-                swift{}
                 grpc { // Options added to --grpc_out
                     option 'lite'
                 }
                 grpc_python {
                     outputSubDir = 'python'
                 }
-                grpc_swift {
-                    outputSubDir = 'swift'
+                if(osdetector.os != 'windows'){
+                    swift{}
+                    grpc_swift {
+                        outputSubDir = 'swift'
+                    }
                 }
             }
         }