Skip to content

Update dependencies #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update dependencies #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
xcode:
- 26.2
- 26.4
platform:
- iOS
steps:
Expand All @@ -18,15 +18,15 @@ jobs:
with:
submodules: recursive
- name: Download Libdigidocpp iOS artifact
uses: dawidd6/action-download-artifact@v15
uses: dawidd6/action-download-artifact@v20
with:
workflow: build.yml
branch: master
name: iphoneos
path: libdigidocpp-ios
repo: open-eid/libdigidocpp
- name: Download Libdigidocpp iOS Simulator artifact
uses: dawidd6/action-download-artifact@v15
uses: dawidd6/action-download-artifact@v20
with:
workflow: build.yml
branch: master
Expand All @@ -44,14 +44,9 @@ jobs:
rm -rf $LIBDIGIDOCPP_PATH/ios-arm64_x86_64-simulator && mkdir $LIBDIGIDOCPP_PATH/ios-arm64_x86_64-simulator && cp -r ${{ github.workspace }}/libdigidocpp.iphonesimulator/libdigidocpp.iphonesimulator/lib/digidocpp.framework $LIBDIGIDOCPP_PATH/ios-arm64_x86_64-simulator/
- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master
- name: Install Swift-sh
run: brew install swift-sh
- name: Install Mockolo
run: |
curl -L https://github.com/uber/mockolo/releases/download/2.5.0/mockolo.artifactbundle.zip -o mockolo.zip
unzip mockolo.zip
sudo cp mockolo.artifactbundle/mockolo/macos/mockolo /usr/local/bin/mockolo
uses: Homebrew/actions/setup-homebrew@main
- name: Install dependencies
run: brew install swift-sh mockolo
- name: Setup config and TSL files
run: |
export RESOURCES_DIRECTORY="Modules/ConfigLib/Sources/ConfigLib/Resources"
Expand Down Expand Up @@ -95,6 +90,8 @@ jobs:
GOOGLE_SERVICES_PLIST: ${{ secrets.GOOGLE_SERVICES_PLIST }}
run: |
export LANG=en_US.UTF-8

sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app

# Setup Google Services
echo $GOOGLE_SERVICES_PLIST | base64 --decode > "${{ github.workspace }}/RIADigiDoc/Supporting files/GoogleService-Info.plist"
Expand Down
2 changes: 1 addition & 1 deletion Modules/CommonsLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down
4 changes: 2 additions & 2 deletions Modules/ConfigLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -16,7 +16,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 10, 2)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
.package(url: "https://github.com/TakeScoop/SwiftyRSA", exact: .init(1, 8, 0)),
.package(path: "../CommonsLib"),
.package(path: "../UtilsLib"),
Expand Down
2 changes: 1 addition & 1 deletion Modules/CryptoLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
import PackageDescription

let packageRoot = #filePath
Expand Down
9 changes: 6 additions & 3 deletions Modules/IdCardLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
import PackageDescription

let package = Package(
Expand All @@ -13,7 +13,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
.package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 21, 0)),
.package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 23, 0)),
.package(url: "https://github.com/leif-ibsen/Digest.git", exact: .init(1, 13, 0)),
.package(url: "https://github.com/filom/ASN1Decoder", exact: .init(1, 10, 0)),
.package(url: "https://github.com/leif-ibsen/SwiftECC.git", exact: .init(5, 5, 0)),
Expand Down Expand Up @@ -60,7 +60,10 @@ let package = Package(
.target(
name: "IdCardLibMocks",
dependencies: ["IdCardLib"],
path: "Tests/Mocks/Generated"
path: "Tests/Mocks/Generated",
swiftSettings: [
.swiftLanguageMode(.v5)
]
),
.testTarget(
name: "IdCardLibTests",
Expand Down
2 changes: 1 addition & 1 deletion Modules/LibdigidocLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
import PackageDescription

let package = Package(
Expand Down
4 changes: 2 additions & 2 deletions Modules/MobileIdLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -15,7 +15,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 10, 2)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
.package(path: "../CommonsLib"),
.package(path: "../UtilsLib")
],
Expand Down
4 changes: 2 additions & 2 deletions Modules/SmartIdLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -15,7 +15,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 10, 2)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
.package(path: "../UtilsLib"),
.package(path: "../CommonsLib")
],
Expand Down
6 changes: 3 additions & 3 deletions Modules/Test/CommonsTestShared/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -14,8 +14,8 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/weichsel/ZIPFoundation", exact: .init(0, 9, 19)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 10, 2)),
.package(url: "https://github.com/weichsel/ZIPFoundation", exact: .init(0, 9, 20)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
.package(path: "../CommonsLib")
],
targets: [
Expand Down
6 changes: 3 additions & 3 deletions Modules/UtilsLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -16,8 +16,8 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 10, 2)),
.package(url: "https://github.com/weichsel/ZIPFoundation", exact: .init(0, 9, 19)),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
.package(url: "https://github.com/weichsel/ZIPFoundation", exact: .init(0, 9, 20)),
.package(path: "../CommonsLib"),
.package(path: "../ConfigLib"),
.package(path: "../Test/CommonsTestShared")
Expand Down
22 changes: 11 additions & 11 deletions RIADigiDoc.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,40 +1693,40 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/leif-ibsen/BigInt";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.21.0;
kind = exactVersion;
version = 1.23.0;
};
};
1A2D04BD2E8588F100A7269B /* XCRemoteSwiftPackageReference "SwiftECC" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/leif-ibsen/SwiftECC";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.5.0;
kind = exactVersion;
version = 5.5.0;
};
};
1A7CC1C52E71CAAB0002CEA3 /* XCRemoteSwiftPackageReference "ASN1Decoder" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/filom/ASN1Decoder";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.10.0;
kind = exactVersion;
version = 1.10.0;
};
};
DF1D59582F3BF88000855E2E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 12.9.0;
version = 12.12.1;
};
};
DF54F82D2D431BD50021D05A /* XCRemoteSwiftPackageReference "swift-certificates" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-certificates.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.7.0;
kind = exactVersion;
version = 1.19.0;
};
};
DF9AFE902E00D30A0062C64D /* XCRemoteSwiftPackageReference "Factory" */ = {
Expand All @@ -1742,15 +1742,15 @@
repositoryURL = "https://github.com/Alamofire/Alamofire.git";
requirement = {
kind = exactVersion;
version = 5.10.2;
version = 5.11.2;
};
};
DFED7A5F2CC9A3B200D8BCA9 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
requirement = {
kind = exactVersion;
version = 0.57.0;
version = 0.63.2;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
38 changes: 19 additions & 19 deletions RIADigiDoc.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading