diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index b147fd89..ef954b81 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -9,7 +9,7 @@ jobs: deploy_public_beta_pod: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.PAT_ACTIONS }} @@ -20,6 +20,7 @@ jobs: with: fallback: 1.0.0 + - name: Deploy to Cocoapods run: | set -eo pipefail diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index e8512184..056f9f4d 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -16,7 +16,7 @@ jobs: bump_version_spec: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.PAT_ACTIONS }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 770add63..781b5d87 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -46,11 +46,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -64,7 +64,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # â„šī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -77,12 +77,12 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" - name: Upload SARIF Results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sarif-results-swift path: /Users/runner/work/skyflow-ios/results/swift.sarif diff --git a/.github/workflows/internal_release.yml b/.github/workflows/internal_release.yml index b4db6d9e..9b0d490d 100644 --- a/.github/workflows/internal_release.yml +++ b/.github/workflows/internal_release.yml @@ -16,7 +16,7 @@ jobs: deploy_private_pod: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.PAT_ACTIONS }} @@ -48,6 +48,7 @@ jobs: with: ssh-private-key: ${{ secrets.SSH_ACTIONS }} + - name: Push updated spec file run: | pod repo add private_spec git@github.com:skyflowapi/skyflow-iOS-private-spec.git diff --git a/.github/workflows/main_coverage_upload.yml b/.github/workflows/main_coverage_upload.yml index 898e6af5..41a4fbfb 100644 --- a/.github/workflows/main_coverage_upload.yml +++ b/.github/workflows/main_coverage_upload.yml @@ -8,12 +8,12 @@ on: jobs: CoverageReport: name: Xcode Build - runs-on: macOS-latest + runs-on: macOS-15 timeout-minutes: 30 steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Select Xcode 16 run: sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3149c731..3a18db5d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,7 +19,7 @@ jobs: SwiftLint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: SwiftLint uses: norio-nomura/action-swiftlint@3.2.1 env: @@ -28,12 +28,12 @@ jobs: args: --config .swiftlint.yml xcode-build: name: Xcode Build - runs-on: macOS-latest + runs-on: macOS-15 timeout-minutes: 30 steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Select Xcode 16 run: sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 259d6ed6..a478f038 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,14 +2,15 @@ name: Public Release on: push: - tags: '*.*.*' + tags: + - '*.*.*' jobs: deploy_private_pod: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: main @@ -21,6 +22,7 @@ jobs: with: fallback: 1.0.0 + - name: Deploy to Cocoapods run: | set -eo pipefail diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index c0c11b6a..a6f9bafa 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Semgrep run: pip install semgrep diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 1b706d7b..00000000 --- a/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "AEXML", - "repositoryURL": "https://github.com/tadija/AEXML.git", - "state": { - "branch": null, - "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3", - "version": "4.6.1" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index d8219ba5..b77ae820 100644 --- a/Package.swift +++ b/Package.swift @@ -14,14 +14,13 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. // .package(url: /* package url */, from: "1.0.0"), - .package(url: "https://github.com/tadija/AEXML.git", from: "4.6.1") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "Skyflow", - dependencies: ["AEXML"], + dependencies: [], resources: [ .process("Resources") ] diff --git a/Skyflow.podspec b/Skyflow.podspec index db35e3f2..616e1738 100644 --- a/Skyflow.podspec +++ b/Skyflow.podspec @@ -14,11 +14,11 @@ Pod::Spec.new do |spec| spec.author = { "Skyflow" => "service-ops@skyflow.com" } - spec.swift_version = '4.2' + spec.swift_version = '5.0' - spec.platform = :ios, "9.0" - - spec.ios.deployment_target = "9.0" + spec.platform = :ios, "13.0" + + spec.ios.deployment_target = "13.0" spec.source = { :git => "https://github.com/skyflowapi/skyflow-iOS.git", :tag => "1.25.0" } @@ -26,6 +26,5 @@ Pod::Spec.new do |spec| spec.resource_bundles = {'Skyflow' => ['Sources/Skyflow/Resources/**/*.{xcassets}'] } - spec.dependency "AEXML", "4.6.1" end diff --git a/Sources/Skyflow/core/Client.swift b/Sources/Skyflow/core/Client.swift index a1d1afa3..c9e51761 100644 --- a/Sources/Skyflow/core/Client.swift +++ b/Sources/Skyflow/core/Client.swift @@ -5,7 +5,6 @@ // Implementation of Skyflow Client class import Foundation -import AEXML public class Client { var vaultID: String diff --git a/Tests/skyflow-iOS-revealTests/RevealElementOptionsTests.swift b/Tests/skyflow-iOS-revealTests/RevealElementOptionsTests.swift index 9a67b1fd..32d6688b 100644 --- a/Tests/skyflow-iOS-revealTests/RevealElementOptionsTests.swift +++ b/Tests/skyflow-iOS-revealTests/RevealElementOptionsTests.swift @@ -7,7 +7,7 @@ import Foundation import XCTest -import AEXML + @testable import Skyflow diff --git a/Tests/skyflow-iOS-revealTests/RevealSkyflowLabelViewTests.swift b/Tests/skyflow-iOS-revealTests/RevealSkyflowLabelViewTests.swift index fee29581..5bc478bb 100644 --- a/Tests/skyflow-iOS-revealTests/RevealSkyflowLabelViewTests.swift +++ b/Tests/skyflow-iOS-revealTests/RevealSkyflowLabelViewTests.swift @@ -7,7 +7,7 @@ import Foundation import XCTest -import AEXML + @testable import Skyflow class RevealSkyflowLabelViewTests: XCTestCase { diff --git a/Tests/skyflow-iOS-revealTests/skyflow_iOS_revealTests.swift b/Tests/skyflow-iOS-revealTests/skyflow_iOS_revealTests.swift index a0a6257a..101264b8 100644 --- a/Tests/skyflow-iOS-revealTests/skyflow_iOS_revealTests.swift +++ b/Tests/skyflow-iOS-revealTests/skyflow_iOS_revealTests.swift @@ -4,7 +4,7 @@ import Foundation import XCTest -import AEXML + @testable import Skyflow // swiftlint:disable:next type_body_length