Merge pull request #25 from duckduckgo/develop

Make swift package

Author: jaceklyp

.github/workflows/pr.yml

@@ -0,0 +1,28 @@
+name: PR Checks
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  unit-tests:
+    name: Unit Tests
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Run tests
+      run: ./run_test.sh
+      shell: bash
+
+    - name: Run Swift build
+      run: |
+        swift build

.gitignore

@@ -1,3 +1,5 @@
 .idea
 cmake-build-debug
-build
+build
+.swiftpm/
+.DS_Store

Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "BloomFilter",
+    platforms: [
+        .iOS(.v14),
+        .macOS(.v10_15)
+    ],
+    products: [
+        .library(
+            name: "BloomFilter",
+            targets: ["BloomFilter"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "BloomFilter",
+            path: "src",
+            sources: ["BloomFilter.cpp"],
+            publicHeadersPath: "."
+        )
+    ],
+    cxxLanguageStandard: .cxx11
+)

run_test.sh

@@ -1,4 +1,6 @@
-directory=`dirname $0`
-mkdir $directory/build;
-(cd $directory/build; cmake ..; make all;)
-$directory/build/test/RunTests
+#!/usr/bin/env bash
+
+directory=$(dirname "$0")
+mkdir "$directory"/build;
+(cd "$directory"/build || exit; cmake ..; make all;)
+"$directory"/build/test/RunTests

utils/CMakeLists.txt

@@ -1,15 +1,14 @@
 cmake_minimum_required(VERSION 3.5)
 
 if(APPLE)
-    include_directories(/usr/local/opt/openssl/include)
-    link_directories(/usr/local/opt/openssl/lib)
+    if(EXISTS /usr/local/opt/openssl/)
+        set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
+    elseif(EXISTS /opt/homebrew/opt/openssl@1.1/)
+        set(OPENSSL_ROOT_DIR /opt/homebrew/opt/openssl@1.1)
+    endif()
 endif()
 
-link_libraries(crypto)
-add_executable (GenerateFilter GenerateFilter.cpp)
+find_package (OpenSSL REQUIRED)
 
-if(APPLE)
-    target_link_libraries (GenerateFilter LINK_PUBLIC BloomFilter crypto)
-else()
-    target_link_libraries (GenerateFilter LINK_PUBLIC BloomFilter)
-endif()
+add_executable (GenerateFilter GenerateFilter.cpp)
+target_link_libraries (GenerateFilter LINK_PUBLIC BloomFilter OpenSSL::Crypto)