Skip to content

Commit 23d44f4

Browse files
authored
Merge pull request #31 from OutSystems/feat/RMET-4316/spm-compatibility
RMET-4316 :: SPM compatibility
2 parents f619d31 + 8be3623 commit 23d44f4

39 files changed

+47
-13
lines changed

.github/workflows/continuous_integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
sonarcloud:
1212
name: Unit-Tests
13-
runs-on: macos-latest
13+
runs-on: macos-14
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4
@@ -48,4 +48,4 @@ jobs:
4848
run: bundle exec fastlane sonarqube
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51-
SONAR_TOKEN: ${{ secrets.SONARCLOUD_KEY }}
51+
SONAR_TOKEN: ${{ secrets.SONARCLOUD_KEY }}

.github/workflows/prepare_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
build-and-release:
1818
if: github.ref == 'refs/heads/main'
19-
runs-on: macos-latest
19+
runs-on: macos-14
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v4
@@ -78,4 +78,4 @@ jobs:
7878
/repos/${{ github.repository }}/issues/${{ env.PR_NUMBER }}/labels \
7979
-f "labels[]=release"
8080
env:
81-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_and_publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
post-merge:
1111
if: contains(github.event.pull_request.labels.*.name, 'release') && github.event.pull_request.merged == true
12-
runs-on: macos-latest
12+
runs-on: macos-14
1313

1414
steps:
1515
- name: Checkout Repository
@@ -64,4 +64,4 @@ jobs:
6464
- name: Delete Release Branch
6565
run: git push origin --delete prepare-new-release-${{ env.VERSION }}
6666
env:
67-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Unreleased]
8+
9+
### Features
10+
11+
- Add support for Swift Package Manager (SPM) compatibility. [RMET-4316](https://outsystemsrd.atlassian.net/browse/RMET-4316).
12+
713
## 2.1.0
814

915
### Features

OSInAppBrowserLib.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@
202202
756346612C00F21000685AA3 /* OSIABEngine.swift */,
203203
7563465D2C00F21000685AA3 /* OSIABRouter.swift */,
204204
);
205-
path = OSInAppBrowserLib;
205+
name = OSInAppBrowserLib;
206+
path = Sources/OSInAppBrowserLib;
206207
sourceTree = "<group>";
207208
};
208209
7575CF6D2BFCEE6F008F3FD0 /* OSInAppBrowserLibTests */ = {
@@ -215,7 +216,8 @@
215216
75094A042C1213A3006843E1 /* OSIABWebViewRouterAdapterTests.swift */,
216217
75EF1AFA2C13069E005D7164 /* OSIABViewModelTests.swift */,
217218
);
218-
path = OSInAppBrowserLibTests;
219+
name = OSInAppBrowserLibTests;
220+
path = Tests/OSInAppBrowserLibTests;
219221
sourceTree = "<group>";
220222
};
221223
7575CF7E2BFCEEEA008F3FD0 /* Helper Files */ = {

Package.swift

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// swift-tools-version:5.7
2+
import PackageDescription
3+
4+
let package = Package(
5+
name: "OSInAppBrowserLib",
6+
platforms: [
7+
.iOS(.v14)
8+
],
9+
products: [
10+
.library(
11+
name: "OSInAppBrowserLib",
12+
targets: ["OSInAppBrowserLib"]
13+
),
14+
],
15+
targets: [
16+
.target(
17+
name: "OSInAppBrowserLib",
18+
path: "Sources/OSInAppBrowserLib"
19+
),
20+
.testTarget(
21+
name: "OSInAppBrowserLibTests",
22+
dependencies: ["OSInAppBrowserLib"],
23+
path: "Tests/OSInAppBrowserLibTests"
24+
),
25+
]
26+
)

OSInAppBrowserLib/Models/OSIABAnimationEffect.swift renamed to Sources/OSInAppBrowserLib/Models/OSIABAnimationEffect.swift

File renamed without changes.
File renamed without changes.

OSInAppBrowserLib/Models/OSIABToolbarPosition.swift renamed to Sources/OSInAppBrowserLib/Models/OSIABToolbarPosition.swift

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)