Update c-ares to 1.19.1

.swiftformat

@@ -1,18 +1,19 @@
---swiftversion 5.0
-
 # file options
 
+--swiftversion 5.5
 --exclude .build
 
 # format options
 
---ifdef no-indent
---indent 4
---patternlet inline
 --self insert
---stripunusedargs closure-only
---wraparguments before-first
+--patternlet inline
+--stripunusedargs unnamed-only
+--ifdef no-indent
+--guardelse same-line
+--nevertrailing filter
+--extensionacl on-declarations
 
 # rules
 
---disable blankLinesAroundMark
+--disable wrapMultilineStatementBraces
+

Package.swift

@@ -1,15 +1,14 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.5
 
 import class Foundation.FileManager
 import PackageDescription
 
 var caresExclude = [
-    "./c-ares/acountry.c",
-    "./c-ares/adig.c",
-    "./c-ares/ahost.c",
-    "./c-ares/ares_android.c",
-    "./c-ares/windows_port.c",
-    "./c-ares/test/",
+    "./c-ares/src/lib/cares.rc",
+    "./c-ares/src/lib/CMakeLists.txt",
+    "./c-ares/src/lib/ares_config.h.cmake",
+    "./c-ares/src/lib/Makefile.am",
+    "./c-ares/src/lib/Makefile.inc",
 ]
 
 do {
@@ -26,19 +25,29 @@ let package = Package(
         .library(name: "AsyncDNSResolver", targets: ["AsyncDNSResolver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-log", .upToNextMajor(from: "1.0.0")),
     ],
     targets: [
         .target(
-            name: "CAsyncDNSResolver", dependencies: [],
+            name: "CAsyncDNSResolver",
+            dependencies: [],
             exclude: caresExclude,
-            sources: ["./c-ares"],
+            sources: ["./c-ares/src/lib"],
             cSettings: [
-                .headerSearchPath("./c-ares"),
+                .headerSearchPath("./c-ares/include"),
+                .headerSearchPath("./c-ares/src/lib"),
                 .define("HAVE_CONFIG_H", to: "1"),
             ]
         ),
-        .target(name: "AsyncDNSResolver", dependencies: ["CAsyncDNSResolver", "Logging"]),
+
+        .target(
+            name: "AsyncDNSResolver",
+            dependencies: [
+                "CAsyncDNSResolver",
+                .product(name: "Logging", package: "swift-log"),
+            ]
+        ),
+
         .testTarget(name: "AsyncDNSResolverTests", dependencies: ["AsyncDNSResolver"]),
     ],
     cLanguageStandard: .gnu11

Sources/AsyncDNSResolver/Options.swift

@@ -271,7 +271,7 @@ class AresOptions {
         // The pointers are being replaced so deallocate them first
         self.domainPointers?.deallocate()
 
-        let domainPointers = domains.map { $0.ccharArrayPointer }
+        let domainPointers = domains.map(\.ccharArrayPointer)
         self.domainPointers = domainPointers
 
         domainPointers.withUnsafeBufferPointer { bufferPointer in

Sources/CAsyncDNSResolver/include/CAsyncDNSResolver.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftAsyncDNSResolver open source project
 //
-// Copyright (c) 2020-2021 Apple Inc. and the SwiftAsyncDNSResolver project authors
+// Copyright (c) 2020-2023 Apple Inc. and the SwiftAsyncDNSResolver project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -20,6 +20,6 @@
 
 #include "ares_build.h"
 #include "ares_config.h"
-#include "../c-ares/ares.h"
+#include "../c-ares/include/ares.h"
 
 #endif

docker/Dockerfile

@@ -1,5 +1,5 @@
-ARG swift_version=5.1
-ARG ubuntu_version=bionic
+ARG swift_version=5.5
+ARG ubuntu_version=focal
 ARG base_image=swift:$swift_version-$ubuntu_version
 FROM $base_image
 # needed to do again after FROM due to docker limitation
@@ -16,21 +16,13 @@ ENV LANGUAGE en_US.UTF-8
 RUN apt-get update && apt-get install -y wget
 RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
 
-# ruby and jazzy for docs generation
-RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
-RUN if [ "${ubuntu_version}" == "focal" ] ; then gem install jazzy --no-document ; fi
-
 # tools
 RUN mkdir -p $HOME/.tools
 RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
 
-# script to allow mapping framepointers on linux (until part of the toolchain)
-RUN wget -q https://raw.githubusercontent.com/apple/swift/master/utils/symbolicate-linux-fatal -O $HOME/.tools/symbolicate-linux-fatal
-RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
-
 # swiftformat (until part of the toolchain)
 
-ARG swiftformat_version=0.44.6
+ARG swiftformat_version=0.50.1
 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
 RUN cd $HOME/.tools/swift-format && swift build -c release
 RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.2004.54.yaml → docker/docker-compose.2004.56.yaml

@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-async-dns-resolver:20.04-5.4
+    image: swift-async-dns-resolver:20.04-5.6
     build:
       args:
         ubuntu_version: "focal"
-        swift_version: "5.4"
+        swift_version: "5.6"
 
   test:
-    image: swift-async-dns-resolver:20.04-5.4
+    image: swift-async-dns-resolver:20.04-5.6
     environment: []
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:
-    image: swift-async-dns-resolver:20.04-5.4
+    image: swift-async-dns-resolver:20.04-5.6

docker/docker-compose.2204.57.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-async-dns-resolver:22.04-5.7
+    build:
+      args:
+        ubuntu_version: "jammy"
+        swift_version: "5.7"
+
+  test:
+    image: swift-async-dns-resolver:22.04-5.7
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-async-dns-resolver:22.04-5.7

docker/docker-compose.2204.58.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-async-dns-resolver:22.04-5.8
+    build:
+      args:
+        ubuntu_version: "jammy"
+        swift_version: "5.8"
+
+  test:
+    image: swift-async-dns-resolver:22.04-5.8
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-async-dns-resolver:22.04-5.8

docker/docker-compose.2204.59.yaml

@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-async-dns-resolver:22.04-5.9
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.9-jammy"
+
+  test:
+    image: swift-async-dns-resolver:22.04-5.9
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-async-dns-resolver:22.04-5.9

docker/docker-compose.2204.main.yaml

@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-async-dns-resolver:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: swift-async-dns-resolver:22.04-main
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-async-dns-resolver:22.04-main

docker/docker-compose.yaml

@@ -28,7 +28,7 @@ services:
 
   test:
     <<: *common
-    command: /bin/bash -xcl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
+    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
 
   # util
 

scripts/soundness.sh

@@ -3,7 +3,7 @@
 ##
 ## This source file is part of the SwiftAsyncDNSResolver open source project
 ##
-## Copyright (c) 2020-2021 Apple Inc. and the SwiftAsyncDNSResolver project authors
+## Copyright (c) 2020-2023 Apple Inc. and the SwiftAsyncDNSResolver project authors
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
@@ -18,7 +18,7 @@ here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 function replace_acceptable_years() {
     # this needs to replace all acceptable forms with 'YEARS'
-    sed -e 's/2020-2021/YEARS/' -e 's/2020/YEARS/' -e 's/2021/YEARS/'
+    sed -e 's/202[012]-202[123]/YEARS/' -e 's/202[0123]/YEARS/'
 }
 
 printf "=> Checking format... "