Adding API to Service and Requests(#20)

brightdigit · May 24, 2023 · 153feea · 153feea
1 parent c281e78
commit 153feea
Show file tree

Hide file tree

Showing 86 changed files with 910 additions and 1,973 deletions.
diff --git a/.github/workflows/Prch.yml b/.github/workflows/Prch.yml
@@ -1,119 +1,198 @@
 name: Prch
 on:
   push:
-    branches:
-      - '*'
-      - 'feature/*'
-      - 'release/*'
-      - 'bugfix/*'
-    tags: '*'
+    branches-ignore:
+      - '*WIP'
+
+env:
+  CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true
+
 jobs:
   build-ubuntu:
     name: Build on Ubuntu
     env:
-      PACKAGE_NAME: Prch
       SWIFT_VER: ${{ matrix.swift-version }}
     runs-on: ${{ matrix.runs-on }}
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:
-        runs-on: [ubuntu-18.04, ubuntu-20.04]
-        swift-version: [5.2.4, 5.3.3, 5.4.1, 5.5.2, 5.6.2]
+        runs-on: [ubuntu-20.04, ubuntu-22.04]
+        swift-version: [5.7.3, 5.8]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set Ubuntu Release DOT
         run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
       - name: Set Ubuntu Release NUM
         run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
       - name: Set Ubuntu Codename
         run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
+      - name: Cache swift package modules
+        id: cache-spm-linux
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-spm
+        with:
+          path: .build
+          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+      - name: Cache swift
+        id: cache-swift-linux
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-swift
+        with:
+          path: swift-${{ env.SWIFT_VER }}-RELEASE-ubuntu${{ env.RELEASE_DOT }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ env.RELEASE_DOT }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
       - name: Download Swift
+        if: steps.cache-swift-linux.outputs.cache-hit != 'true'
         run: curl -O https://download.swift.org/swift-${SWIFT_VER}-release/ubuntu${RELEASE_NUM}/swift-${SWIFT_VER}-RELEASE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
       - name: Extract Swift
+        if: steps.cache-swift-linux.outputs.cache-hit != 'true'
         run: tar xzf swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
       - name: Add Path
         run: echo "$GITHUB_WORKSPACE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}/usr/bin" >> $GITHUB_PATH
       - name: Build
         run: swift build
-      - name: Run tests
-        run: swift test --enable-test-discovery --enable-code-coverage
-      # - name: Prepare Code Coverage
-      #   run: llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/debug/${{ env.PACKAGE_NAME }}PackageTests.xctest -instr-profile .build/debug/codecov/default.profdata > info.lcov
-      # - name: Upload to CodeCov.io
-      #   run: bash <(curl https://codecov.io/bash) -F github -F ${RELEASE_NAME} -F ${SWIFT_VER}
-      #   env:
-      #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Test
+        run: swift test --enable-code-coverage
+      - uses: sersoft-gmbh/swift-coverage-action@v3
+        with:
+          fail-on-empty-output: true
+      - name: Upload package coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: true
+          flags: spm,swift-${{ matrix.swift-version }}
+          token: ${{ secrets.CODECOV_TOKEN }}
   build-macos:
     name: Build on macOS
-    env:
-      PACKAGE_NAME: Prch
     runs-on: ${{ matrix.runs-on }}
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:
-        runs-on: [macos-11, macos-10.15]
-        xcode: ["/Applications/Xcode_12.4.app", "/Applications/Xcode_11.7.app"]
         include:
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.4.1.app"
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.5.app"
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.6.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_12.5.1.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_13.0.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_13.1.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_13.2.1.app"
-          - runs-on: macos-12
-            xcode: "/Applications/Xcode_13.2.1.app"
           - runs-on: macos-12
-            xcode: "/Applications/Xcode_13.3.1.app"
+            xcode: "/Applications/Xcode_14.0.1.app"
+            iOSVersion: "16.0"
+            watchOSVersion: "9.0"
+            watchName: "Apple Watch Series 8 (41mm)"
+            iPhoneName: "iPhone 12"
           - runs-on: macos-12
-            xcode: "/Applications/Xcode_13.4.app"
+            xcode: "/Applications/Xcode_14.1.app"
+            iOSVersion: "16.1"
+            watchOSVersion: "9.1"
+            watchName: "Apple Watch Ultra (49mm)"
+            iPhoneName: "iPhone 13"
           - runs-on: macos-12
-            xcode: "/Applications/Xcode_13.4.1.app"
+            xcode: "/Applications/Xcode_14.2.app"
+            iOSVersion: "16.2"
+            watchOSVersion: "9.1"
+            watchName: "Apple Watch Ultra (49mm)"
+            iPhoneName: "iPhone 14"
+          - runs-on: macos-13
+            xcode: "/Applications/Xcode_14.3.app"
+            iOSVersion: "16.4"
+            watchOSVersion: "9.4"
+            watchName: "Apple Watch Ultra (49mm)"
+            iPhoneName: "iPhone 14 Pro Max"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Cache swift package modules
+        id: cache-spm-macos
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-spm
+        with:
+          path: .build
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.xcode }}-${{ hashFiles('Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.xcode }}-
+      - name: Cache mint
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        id: cache-mint
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-mint
+        with:
+          path: .mint
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Mintfile') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Set Xcode Name
         run: echo "XCODE_NAME=$(basename -- ${{ matrix.xcode }} | sed 's/\.[^.]*$//' | cut -d'_' -f2)" >> $GITHUB_ENV
       - name: Setup Xcode
         run: sudo xcode-select -s ${{ matrix.xcode }}/Contents/Developer
+      - name: Install mint
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        run: |
+          brew update
+          brew install mint
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
       - name: Build
         run: swift build
-      - name: Lint
-        if: startsWith(github.ref, 'refs/tags/') != true
-        run: swift run swiftformat --lint . && swift run swiftlint
-      - name: Run tests
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+      - name: Run Swift Package tests
         run: swift test -v --enable-code-coverage
-      # - name: Prepare Code Coverage
-      #   run: xcrun llvm-cov export -format="lcov" .build/debug/${{ env.PACKAGE_NAME }}PackageTests.xctest/Contents/MacOS/${{ env.PACKAGE_NAME }}PackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov
-      # - name: Upload to CodeCov.io
-      #   run: bash <(curl https://codecov.io/bash) -F github -F macOS -F ${{ matrix.runs-on }}
-      #   env:
-      #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      - name: Build sourcedocs Documentation
-        if: ${{ matrix.os == 'macos-11' && matrix.xcode == '/Applications/Xcode_12.5.app' && !startsWith(github.ref, 'refs/tags/') }}
-        run: "swift run sourcedocs generate build -cra\ngit config --local user.email \"[email protected]\"\ngit config --local user.name \"GitHub Action\"\ngit status\ngit add Documentation\ngit diff-index --quiet HEAD || git commit -m \"[github action] Update Docs\"\ngit push    \n"
-  deploy:
-    name: Deploy to Netlify
-    needs: [build-macos, build-ubuntu]
-    env:
-      PACKAGE_NAME: Prch
-    runs-on: macos-11
-    if: ${{ github.ref == 'refs/heads/main' }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Netlify
-        run: brew install netlify-cli
-      - name: Setup Xcode
-        run: sudo xcode-select -s /Applications/Xcode_13.0.app/Contents/Developer
-      - name: Resolve Package Dependencies
-        run: xcodebuild -resolvePackageDependencies -scheme ${{ env.PACKAGE_NAME }} -derivedDataPath DerivedData
-      - name: Build DocC Documentation
-        run: xcodebuild docbuild -scheme ${{ env.PACKAGE_NAME }} -destination 'platform=macOS' -derivedDataPath DerivedData
-    #  - name: Deploy Files
-    #    run: netlify deploy --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{ secrets.NETLIFY_AUTH_TOKEN }} --prod
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+      - uses: sersoft-gmbh/swift-coverage-action@v2
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+      - name: Upload SPM coverage to Codecov
+        uses: codecov/codecov-action@v2
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        with:
+          fail_ci_if_error: true
+          flags: spm
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Lint
+        run: ./scripts/lint.sh
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+      - name: Dump PIF
+        #if: startsWith(matrix.xcode,'/Applications/Xcode_14')
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        run: |
+          swift package dump-pif > /dev/null
+          MAX_ATTEMPT=3
+          ATTEMPT=0
+          while [ -z $SUCCESS ] && [ "$ATTEMPT" -le "$MAX_ATTEMPT" ]; do
+            xcodebuild clean -scheme Prch -destination 'generic/platform=iOS' | grep -q "CLEAN SUCCEEDED" && SUCCESS=true
+            ATTEMPT=$(($ATTEMPT+1))
+          done
+      - name: Run iOS target tests
+        run: xcodebuild test -scheme Prch-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+      - uses: sersoft-gmbh/swift-coverage-action@v3
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        with:
+          fail-on-empty-output: true
+      - name: Upload iOS coverage to Codecov
+        uses: codecov/codecov-action@v3
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        with:
+          fail_ci_if_error: true
+          flags: iOS,iOS-${{ matrix.iOSVersion }}
+          token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Run watchOS target tests
+        run: xcodebuild build -scheme Prch-Package -sdk watchsimulator -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}'
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+      - uses: sersoft-gmbh/swift-coverage-action@v3
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        with:
+          fail-on-empty-output: true
+      - name: Upload watchOS coverage to Codecov
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14.3')
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: true
+          flags: watchOS,watchOS${{ matrix.watchOSVersion }}
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -61,8 +61,6 @@ xcuserdata/
 build/
 DerivedData/
 *.moved-aside
-
-# Xcode
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -85,12 +83,11 @@ timeline.xctimeline
 playground.xcworkspace
 
 # Swift Package Manager
-#
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
 # Package.resolved
-*.xcodeproj
+# *.xcodeproj
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
 .swiftpm
@@ -111,9 +108,9 @@ playground.xcworkspace
 
 Carthage/Build/
 
-# Accio dependency management
-Dependencies/
-.accio/
+# Add this lines if you are using Accio dependency management (Deprecated since Xcode 12)
+# Dependencies/
+# .accio/
 
 # fastlane
 # It is recommended to not store the screenshots in the git repo.
@@ -133,16 +130,21 @@ fastlane/test_output
 iOSInjectionProject/
 
 ### SwiftPackageManager ###
-Packages
+#Packages
 xcuserdata
 *.xcodeproj
 
 
 ### SwiftPM ###
+
+
 ### Xcode ###
 # Xcode
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+
+
+
 ## Gcc Patch
 /*.gcno
 
@@ -153,7 +155,20 @@ xcuserdata
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
 
-*.pxd/QuickLook
-# End of https://www.toptal.com/developers/gitignore/api/macos,swift,SwiftPackageManager,Xcode
+/Support/**/*.plist
+/Support/**/*.entitlements
+*.ipa
+*.zip
+*.pkg
+*.app
+
+**/*.xcassets/**/*.png
+**/*.xcassets/**/*.pdf
+**/*.xcassets/**/*.svg
+
+.bundle
+vendor
+.mint
+# End of https://www.toptal.com/developers/gitignore/api/xcode,macos
 
-*.pxd/QuickLook
+*.apns
diff --git a/.periphery.yml b/.periphery.yml
@@ -1,3 +1 @@
-targets:
-- FloxBxModeling
-- FloxBxNetworking
+{}
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5
+5.7
diff --git a/.swiftformat b/.swiftformat
@@ -2,6 +2,6 @@
 --header strip
 --commas inline
 --disable wrapMultilineStatementBraces
---extensionacl on-extension
+--extensionacl on-declarations
 --decimalgrouping 3,4
 --exclude .build, DerivedData