RMET-4316 :: SPM compatibility

.github/workflows/continuous_integration.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   sonarcloud:
     name: Unit-Tests
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -48,4 +48,4 @@ jobs:
         run: bundle exec fastlane sonarqube
         env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_KEY }}
+          SONAR_TOKEN: ${{ secrets.SONARCLOUD_KEY }}

.github/workflows/prepare_release.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build-and-release:
     if: github.ref == 'refs/heads/main'
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -78,4 +78,4 @@ jobs:
             /repos/${{ github.repository }}/issues/${{ env.PR_NUMBER }}/labels \
             -f "labels[]=release"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_and_publish.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   post-merge:
     if: contains(github.event.pull_request.labels.*.name, 'release') && github.event.pull_request.merged == true
-    runs-on: macos-latest
+    runs-on: macos-14
 
     steps:
     - name: Checkout Repository
@@ -64,4 +64,4 @@ jobs:
     - name: Delete Release Branch
       run: git push origin --delete prepare-new-release-${{ env.VERSION }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Features
+
+- Add support for Swift Package Manager (SPM) compatibility. [RMET-4316](https://outsystemsrd.atlassian.net/browse/RMET-4316).
+
 ## 2.1.0
 
 ### Features

OSInAppBrowserLib.xcodeproj/project.pbxproj

@@ -202,7 +202,8 @@
 				756346612C00F21000685AA3 /* OSIABEngine.swift */,
 				7563465D2C00F21000685AA3 /* OSIABRouter.swift */,
 			);
-			path = OSInAppBrowserLib;
+			name = OSInAppBrowserLib;
+			path = Sources/OSInAppBrowserLib;
 			sourceTree = "<group>";
 		};
 		7575CF6D2BFCEE6F008F3FD0 /* OSInAppBrowserLibTests */ = {
@@ -215,7 +216,8 @@
 				75094A042C1213A3006843E1 /* OSIABWebViewRouterAdapterTests.swift */,
 				75EF1AFA2C13069E005D7164 /* OSIABViewModelTests.swift */,
 			);
-			path = OSInAppBrowserLibTests;
+			name = OSInAppBrowserLibTests;
+			path = Tests/OSInAppBrowserLibTests;
 			sourceTree = "<group>";
 		};
 		7575CF7E2BFCEEEA008F3FD0 /* Helper Files */ = {

Package.swift

@@ -0,0 +1,26 @@
+// swift-tools-version:5.7
+import PackageDescription
+
+let package = Package(
+    name: "OSInAppBrowserLib",
+    platforms: [
+        .iOS(.v14)
+    ],
+    products: [
+        .library(
+            name: "OSInAppBrowserLib",
+            targets: ["OSInAppBrowserLib"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "OSInAppBrowserLib",
+            path: "Sources/OSInAppBrowserLib"
+        ),
+        .testTarget(
+            name: "OSInAppBrowserLibTests",
+            dependencies: ["OSInAppBrowserLib"],
+            path: "Tests/OSInAppBrowserLibTests"
+        ),
+    ]
+)

OSInAppBrowserLibTests/OSIABViewModelTests.swift → Tests/OSInAppBrowserLibTests/OSIABViewModelTests.swift

@@ -310,9 +310,9 @@ private extension OSIABViewModelTests {
         return .init(
             url: url,
             customHeaders: customHeaders,
-            webView ?? WKWebView(frame: .zero, configuration: configurationModel.toWebViewConfiguration()),
-            scrollViewBounds,
-            customUserAgent,
+            webView: webView ?? WKWebView(frame: .zero, configuration: configurationModel.toWebViewConfiguration()),
+            scrollViewBounces: scrollViewBounds,
+            customUserAgent: customUserAgent,
             uiModel: .init(
                 showURL: showURL,
                 showToolbar: showToolbar,

OSInAppBrowserLibTests/OSIABWebViewRouterAdapterTests.swift → Tests/OSInAppBrowserLibTests/OSIABWebViewRouterAdapterTests.swift

@@ -135,7 +135,7 @@ private extension OSIABWebViewRouterAdapterTests {
         onBrowserClosed: @escaping (Bool) -> Void = { _ in }
     ) -> OSIABWebViewRouterAdapter {
         .init(
-            options, 
+            options: options, 
             cacheManager: cacheManager,
             callbackHandler: .init(
                 onDelegateURL: { _ in },

fastlane/Fastfile

@@ -18,7 +18,7 @@ default_platform(:ios)
 platform :ios do
   desc "Lane to run the unit tests"
   lane :unit_tests do
-    run_tests(device: "iPhone SE (3rd generation)", scheme: "OSInAppBrowserLib",
+    run_tests(scheme: "OSInAppBrowserLib",
       slack_url: ENV['SLACK_WEBHOOK'])
   end