Merge branch 'ci-gradlew' into 'master'

Fix CI Build

See merge request vato007/picar!7

.gitlab-ci.yml

@@ -3,41 +3,31 @@ stages:
   - build
   - deploy
 
-protoc_base:
+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - "**/Package.resolved"
+    - "**/.build/"
+    - .gradle/
+
+protoc_gen:
   image: vato.ddns.net:8083/gradle
   stage: protoc
   rules:
     - changes:
         - protobuf/*
+  artifacts:
+    paths:
+      - "./**/*pb2*"
+      - "./SwiftyCar/Sources/**/*.pb.swift"
+      - "./SwiftyCar/Sources/**/*.grpc.swift"      
+      - "./CarControlleriOS/Sources/**/*.pb.swift"
+      - "./CarControlleriOS/Sources/**/*.grpc.swift"
+    expire_in: 30 days
   script:
-    - ./gradlew :protobuf:generateProto
+    - gradle :pycar:copyPythonCode
-
+    - gradle :SwiftyCar:copySwiftCode
-protoc_python:
+    - gradle :CarControlleriOS:copySwiftCode
-  extends: protoc_base
-  rules:
-    - changes:
-      - pycar/*
-      - protobuf/*
-  script:
-    - ./gradlew :pycar:copyPythonCode
-
-protoc_swift_Car:
-  extends: protoc_base
-  rules:
-    - changes:
-      - SwiftyCar/*
-      - protobuf/*
-  script:
-    - ./gradlew :SwiftyCar:copySwiftCode
-
-protoc_swift_CarController:
-  extends: protoc_base
-  rules:
-    - changes:
-      - CarControlleriOS/*
-      - protobuf/*
-  script:
-    - ./gradlew :CarControlleriOS:copySwiftCode
 
 build_pycar:
   image: vato.ddns.net:8083/python-infra:buster
@@ -45,9 +35,8 @@ build_pycar:
   rules:
     - changes:
         - pycar/*
-      - protobuf/*
   needs:
-    - protoc_python
+    - protoc_gen
   script:
     - cd pycar && python setup.py bdist_wheel && cd ..
 
@@ -57,13 +46,24 @@ build_pycar_docker:
   rules:
     - changes:
         - pycar/*
-      - protobuf/*
   needs:
-    - protoc_python
+    - protoc_gen
   script:
     - echo ${DOCKER_PASSWORD} | docker login vato.ddns.net:8083 --username ${DOCKER_USERNAME} --password-stdin
     - docker build -f pycar/Dockerfile --build-arg PYPI_USERNAME=${PYPI_USERNAME} --build-arg PYPI_PASSWORD=${PYPI_PASSWORD} -t vato.ddns.net:8082/pycar:latest pycar
 
+built_swift_car:
+  image: vato.ddns.net:8083/swift
+  stage: build
+  rules:
+    - changes:
+        - SwiftyCar/*
+        - protobuf/*
+  needs:
+    - protoc_gen
+  script:
+    - cd SwiftyCar && swift build
+
 build_esp32:
   image: vato.ddns.net:8083/shaguarger/platformio
   stage: build

SwiftyCar/Sources/SwiftyCar/VehicleFactory.swift

@@ -24,8 +24,8 @@ func getVehicle2D() throws -> Vehicle2D? {
             let serialPort = SerialPort(path: "/dev/ttyUSB0")
 
             // The port does not open/initialise inside of the ESP32ServoOutputs, as on macOS /dev/cu.* blocks.
-            try initPort.openPort()
+            try serialPort.openPort()
-            initPort.setSettings(receiveRate: .baud115200, transmitRate: .baud115200, minimumBytesToRead: 1)x
+            serialPort.setSettings(receiveRate: .baud115200, transmitRate: .baud115200, minimumBytesToRead: 1)
             guard let throttlePin = Esp32ServoOutput(forChannel: 1, forPin: 14, onPort: serialPort) else {
                 print("Failed to create throttle pin.")
                 return nil

gradle.properties

@@ -17,4 +17,3 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists