Merge pull request #524 from 417-72KI/drop-swift-5.3

Author: f-meloni

.github/workflows/ci.yml

@@ -7,13 +7,18 @@ on:
       - main
       - master
 
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   test-on-macos-11:
     name: Test on macOS 11
     runs-on: macOS-11
     strategy:
+      fail-fast: false
       matrix:
-        xcode: ["12.4", "12.5.1", "13.0"]
+        xcode: ["12.5.1", "13.2.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -50,8 +55,9 @@ jobs:
     name: Test dependencies resolver
     runs-on: macOS-11
     strategy:
+      fail-fast: false
       matrix:
-        xcode: ["12.4", "12.5.1", "13.0"]
+        xcode: ["12.5.1", "13.2.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -90,8 +96,9 @@ jobs:
     name: Test on Linux
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        swift: ["5.3.3", "5.5.2"]
+        swift: ["5.4.3", "5.5.3"]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -128,8 +135,9 @@ jobs:
     name: Test without SPM on macOS 11
     runs-on: macOS-11
     strategy:
+      fail-fast: false
       matrix:
-        xcode: ["12.4", "12.5.1", "13.0"]
+        xcode: ["12.5.1", "13.2.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -166,8 +174,9 @@ jobs:
     name: Test without SPM on Linux
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        swift: ["5.3.3", "5.5.2"]
+        swift: ["5.4.3", "5.5.3"]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2

.swift-version

@@ -1 +1 @@
-5.3
+5.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM swift:5.5.2-focal
+FROM swift:5.5.3-focal
 
 MAINTAINER Orta Therox
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.4
 
 import PackageDescription
 
@@ -45,7 +45,7 @@ let package = Package(
         .target(name: "DangerDependenciesResolver", dependencies: ["DangerShellExecutor", "Version", "Logger"]),
         .target(name: "Danger", dependencies: ["OctoKit", "Logger", "DangerShellExecutor"]),
         .target(name: "RunnerLib", dependencies: ["Logger", "DangerShellExecutor", "Version"]),
-        .target(name: "Runner", dependencies: ["RunnerLib", "Logger", "DangerDependenciesResolver"]),
+        .executableTarget(name: "Runner", dependencies: ["RunnerLib", "Logger", "DangerDependenciesResolver"]),
         .target(name: "DangerFixtures", dependencies: ["Danger"]),
     ] + devTargets
 )

Scripts/install.sh

@@ -1,45 +1,21 @@
 #!/bin/bash
 
-lower () {
-    IFS='.' read -a v1_array <<< "$1"
-    IFS='.' read -a v2_array <<< "$2"
-    v1=$((v1_array[0] * 100 + v1_array[1] * 10 + v1_array[2]))
-    v2=$((v2_array[0] * 100 + v2_array[1] * 10 + v2_array[2]))
-    diff=$((v2 - v1))
-
-    ((diff >  0)) && return 0
-    return 1
-}
-
 TOOL_NAME="danger-swift"
 PREFIX=${PREFIX:='/usr/local'}
 INSTALL_PATH="$PREFIX/bin/$TOOL_NAME"
-BUILD_PATH=".build/release/$TOOL_NAME"
 LIB_INSTALL_PATH="$PREFIX/lib/danger"
 declare -a SWIFT_LIB_FILES=('libDanger.dylib' 'libDanger.so' 'Danger.swiftdoc' 'Danger.swiftmodule' 'OctoKit.swiftdoc' 'OctoKit.swiftmodule' 'RequestKit.swiftdoc' 'RequestKit.swiftmodule' 'Logger.swiftdoc' 'Logger.swiftmodule' 'DangerShellExecutor.swiftdoc' 'DangerShellExecutor.swiftmodule')
 
-
 DANGER_LIB_DECLARATION='\.library(name:\ \"Danger\", targets: \[\"Danger\"\])'
 DANGER_LIB_DYNAMIC_DECLARATION='\.library(name:\ \"Danger\",\ type:\ \.dynamic,\ targets:\ \[\"Danger\"\])'
-sed  "s/$DANGER_LIB_DECLARATION/$DANGER_LIB_DYNAMIC_DECLARATION/g" Package.swift > tmpPackage
+sed "s/$DANGER_LIB_DECLARATION/$DANGER_LIB_DYNAMIC_DECLARATION/g" Package.swift > tmpPackage
 mv -f tmpPackage Package.swift
 
 swift package clean
 
-SWIFT_VERSION=`swift -version | head -n 1 | perl -lpe 's/.*version\ (\d\.\d\.\d).*/$1/'`
-
-UNAME_OUT="$(uname -s)"
-
-lower $SWIFT_VERSION '5.3.0'
-
-if [[ "$?" -eq 0 || "$OSTYPE" == "darwin"* ]]
-then
+if [[ "$OSTYPE" == "darwin"* ]]; then
     BUILD_FOLDER=".build/release"
-    if [[ `uname -m` == 'arm64' ]]; then
-        swift build --disable-sandbox --arch arm64 -c release
-    else
-        swift build --disable-sandbox -c release
-    fi
+    swift build --disable-sandbox -c release
 else
     BUILD_FOLDER=".build/debug"
     swift build --disable-sandbox