Skip to content

Concurrency adjustments, SPM: platforms, Demo: use LOCAL Package #7

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
Sajjon wants to merge 1 commit into
base: m
Choose a base branch
from
Open

Concurrency adjustments, SPM: platforms, Demo: use LOCAL Package #7

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
31 changes: 13 additions & 18 deletions DfnsDemo/DfnsDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
48F0B3B02ED061F300500085 /* DfnsSdk in Frameworks */ = {isa = PBXBuildFile; productRef = 48F0B3AF2ED061F300500085 /* DfnsSdk */; };
7A1A68702BBEA54B00167ED0 /* DfnsDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1A686F2BBEA54B00167ED0 /* DfnsDemoApp.swift */; };
7A1A68722BBEA54B00167ED0 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1A68712BBEA54B00167ED0 /* ContentView.swift */; };
7A1A68742BBEA54C00167ED0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A1A68732BBEA54C00167ED0 /* Assets.xcassets */; };
7A1A68772BBEA54C00167ED0 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A1A68762BBEA54C00167ED0 /* Preview Assets.xcassets */; };
7A1A68A92BC5943700167ED0 /* MyServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1A68A82BC5943700167ED0 /* MyServer.swift */; };
7A439BB12BCD22710022D861 /* MyBusinessLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A439BB02BCD22710022D861 /* MyBusinessLogic.swift */; };
7A439BB72BCD67270022D861 /* DfnsSdk in Frameworks */ = {isa = PBXBuildFile; productRef = 7A439BB62BCD67270022D861 /* DfnsSdk */; };
7A5207E72BCD8B22003EC637 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A5207E62BCD8B22003EC637 /* Config.swift */; };
/* End PBXBuildFile section */

Expand All @@ -34,7 +34,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7A439BB72BCD67270022D861 /* DfnsSdk in Frameworks */,
48F0B3B02ED061F300500085 /* DfnsSdk in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -97,7 +97,7 @@
);
name = DfnsDemo;
packageProductDependencies = (
7A439BB62BCD67270022D861 /* DfnsSdk */,
48F0B3AF2ED061F300500085 /* DfnsSdk */,
);
productName = DfnsDemo;
productReference = 7A1A686C2BBEA54B00167ED0 /* DfnsDemo.app */;
Expand Down Expand Up @@ -128,7 +128,7 @@
);
mainGroup = 7A1A68632BBEA54B00167ED0;
packageReferences = (
7A439BB52BCD67270022D861 /* XCRemoteSwiftPackageReference "dfns-sdk-swift" */,
48F0B3AE2ED061F300500085 /* XCLocalSwiftPackageReference "../../dfns-sdk-swift" */,
);
productRefGroup = 7A1A686D2BBEA54B00167ED0 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -227,6 +227,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -282,6 +283,7 @@
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -313,7 +315,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Copy link
Author

@Sajjon Sajjon Nov 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed from the target DfnsDemo and moved to the DfnsDemo project (thus covering ALL targets, e.g. unit test targets when/if added).

(You will see two of these guys, one for Debug and one for Release.)

TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -345,7 +346,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down Expand Up @@ -373,21 +373,16 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
7A439BB52BCD67270022D861 /* XCRemoteSwiftPackageReference "dfns-sdk-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/dfns/dfns-sdk-swift";
requirement = {
branch = m;
kind = branch;
};
/* Begin XCLocalSwiftPackageReference section */
48F0B3AE2ED061F300500085 /* XCLocalSwiftPackageReference "../../dfns-sdk-swift" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = "../../dfns-sdk-swift";
};
/* End XCRemoteSwiftPackageReference section */
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
7A439BB62BCD67270022D861 /* DfnsSdk */ = {
48F0B3AF2ED061F300500085 /* DfnsSdk */ = {
isa = XCSwiftPackageProductDependency;
package = 7A439BB52BCD67270022D861 /* XCRemoteSwiftPackageReference "dfns-sdk-swift" */;
productName = DfnsSdk;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
15 changes: 0 additions & 15 deletions DfnsDemo/DfnsDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion DfnsDemo/DfnsDemo/DfnsDemoApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DfnsSdk
@preconcurrency import DfnsSdk
import SwiftUI

class UserConfig: ObservableObject {
Expand Down
2 changes: 1 addition & 1 deletion DfnsDemo/DfnsDemo/MyBusinessLogic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DfnsSdk
@preconcurrency import DfnsSdk
import Foundation

/**
Expand Down
2 changes: 1 addition & 1 deletion DfnsDemo/DfnsDemo/MyServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DfnsSdk
@preconcurrency import DfnsSdk
import Foundation

/**
Expand Down
13 changes: 13 additions & 0 deletions DfnsDemo/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// swift-tools-version:6.2

// This is a HACKY workaround the fact that SPM does not allow for Package level exclusion
// of files/folders. SPM actually HAD support for it but it was removed in 2017, in PR
// https://github.com/apple/swift-package-manager/commit/cb69accf41da55386f9703308958aa49ca2a4c5f
//
// So instead we have to add an empty dummy Package.swift to each folder we wanna hide, as per:
// See: https://github.com/apple/swift-package-manager/issues/4460#issuecomment-1475025748
// And: https://stackoverflow.com/questions/69382302/swift-package-how-to-exclude-files-in-root-git-directory-from-the-actual-swift/70990534#70990534
// And: https://github.com/tuist/tuist/pull/2058
import PackageDescription

let package = Package(name: "HIDDEN")
8 changes: 8 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
// swift-tools-version: 5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

// later change swift-tools-version to 6.2

import PackageDescription

let package = Package(
name: "DfnsSdk",
platforms: [
.macOS(.v10_15),
.iOS(.v15),
.watchOS(.v6),
.tvOS(.v13)
],
products: [
// Products define the executables and libraries a package produces, making them visible to other packages.
.library(
Expand Down
Loading