Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/swiftformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ jobs:
if: ${{ steps.changes.outputs.swift == 'true' }}

- name: Install SwiftFormat 0.58.3
if: ${{ steps.changes.outputs.swift == 'true' }}
run: |
curl -L -o swiftformat.zip https://github.com/nicklockwood/SwiftFormat/releases/download/0.58.3/swiftformat_linux.zip
unzip swiftformat.zip -d swiftformat_bin
sudo mv swiftformat_bin/swiftformat_linux /usr/local/bin/swiftformat
chmod +x /usr/local/bin/swiftformat

- name: Run SwiftFormat
if: ${{ steps.changes.outputs.swift == 'true' }}
run: swiftformat --lint . --reporter github-actions-log --config .swiftformat
1 change: 1 addition & 0 deletions WireAnalytics/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Foundation
import PackageDescription

// You can enable/disable Datadog for debugging by overriding the boolean.
// open --env ENABLE_DATADOG=true --env ENABLE_COUNTLY=true wire-ios-mono.xcworkspace
let isDatadogEnabled = hasEnvironmentVariable("ENABLE_DATADOG", "true")
let isCountlyEnabled = hasEnvironmentVariable("ENABLE_COUNTLY", "true")

Expand Down
2 changes: 1 addition & 1 deletion WireAuthentication/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let package = Package(
.package(path: "../WireUI"),
.package(path: "../WirePlugins"),
.package(url: "https://github.com/uber/needle.git", .upToNextMinor(from: "0.25.1")),
.package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0")
.package(url: "https://github.com/siteline/swiftui-introspect", from: "26.0.0"),
],
targets: [
.target(
Expand Down
9 changes: 8 additions & 1 deletion WireLogging/Package.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// swift-tools-version: 6.2

import Foundation
import PackageDescription

let package = Package(
Expand All @@ -26,11 +27,17 @@ let package = Package(
]
)

// open --env CI wire-ios-mono.xcworkspace
// or
// CI= swift build
let isCI = ProcessInfo.processInfo.environment["CI"] != nil

for target in package.targets {
target.swiftSettings = (target.swiftSettings ?? []) + [
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("InternalImportsByDefault"),
.enableUpcomingFeature("MemberImportVisibility"),
.enableUpcomingFeature("StrictMemorySafety"),
]
isCI ? .unsafeFlags(["-warnings-as-errors"]) : nil
].compactMap(\.self)
}
8 changes: 4 additions & 4 deletions WireLogging/Tests/TestPlans/AllTests.xctestplan
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"configurations" : [
{
"id" : "8C7B2297-3D36-4CFC-9B55-BF2CC1C85BF4",
"name" : "Configuration 1",
"id" : "8DA8C849-71C0-4072-92BA-9AF39BAA1039",
"name" : "Test Scheme Action",
"options" : {

}
}
],
"defaultOptions" : {

"performanceAntipatternCheckerEnabled" : true
},
"testTargets" : [
{
"target" : {
"containerPath" : "container:",
"containerPath" : "container:WireLogging",
"identifier" : "WireLoggingTests",
"name" : "WireLoggingTests"
}
Expand Down
9 changes: 8 additions & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,14 @@ platform :ios do
if build.for_simulator
Dir.chdir("..") do
# Build the app for simulator
sh "xcodebuild -workspace 'wire-ios-mono.xcworkspace' -scheme 'Wire-iOS' -configuration 'Debug' -destination \"generic/platform=iOS Simulator\" -derivedDataPath DerivedData -quiet build BUILD_NUMBER=#{build.build_number}"
sh "xcodebuild " \
"-workspace 'wire-ios-mono.xcworkspace' " \
"-scheme 'Wire-iOS' " \
"-configuration 'Debug' " \
"-destination \"generic/platform=iOS Simulator\" " \
"-derivedDataPath DerivedData " \
"-quiet build " \
"BUILD_NUMBER=#{build.build_number}"

# make a "fake" .ipa package that QA will use for installing to simulator
sh "mkdir -p debug/Payload"
Expand Down
2 changes: 1 addition & 1 deletion fastlane/framework.rb
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def to_scheme(name)
when "WireAnalytics"
"WireAnalyticsAll" # if a package has multiple targets, fastlane does not found <Package>-Package
when "WireLogging"
"WireLogging"
"WireLoggingAll" # if a package has multiple targets, fastlane does not find <Package>-Package
when "wire-ios-mocktransport"
"WireMockTransport"
else
Expand Down

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1640"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -18,7 +18,21 @@
BlueprintIdentifier = "WireLogging"
BuildableName = "WireLogging"
BlueprintName = "WireLogging"
ReferencedContainer = "container:">
ReferencedContainer = "container:WireLogging">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WireLoggingSupport"
BuildableName = "WireLoggingSupport"
BlueprintName = "WireLoggingSupport"
ReferencedContainer = "container:WireLogging">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -30,10 +44,22 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:Tests/TestPlans/AllTests.xctestplan"
reference = "container:WireLogging/Tests/TestPlans/AllTests.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WireLoggingTests"
BuildableName = "WireLoggingTests"
BlueprintName = "WireLoggingTests"
ReferencedContainer = "container:WireLogging">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -58,7 +84,7 @@
BlueprintIdentifier = "WireLogging"
BuildableName = "WireLogging"
BlueprintName = "WireLogging"
ReferencedContainer = "container:">
ReferencedContainer = "container:WireLogging">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Loading