Skip to content
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

Jump to bottom

Fix Carthage release #97

Merged
merged 4 commits into from Nov 26, 2020
Merged

Fix Carthage release #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be36702
🔥 Remove SnapKit dependency
lukasackee Nov 25, 2020
8ad0643
🔥 Remove unavailable type that causes archivation failure
lukasackee Nov 25, 2020
cbe11b9
💚 Fix Github actions
lukasackee Nov 25, 2020
7e2b684
💬 Update CHANGELOG
lukasackee Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/deploy.yml
View file
Open in desktop
Expand Up @@ -12,12 +12,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: AckeeCZ/load-xcode-version@1.0
- uses: actions/cache@v1
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
restore-keys: |
${{ runner.os }}-carthage-
- name: Build
run: carthage build --no-skip-current --cache-builds
- name: Archive
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/tests.yml
View file
Open in desktop
Expand Up @@ -9,16 +9,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: AckeeCZ/load-xcode-version@1.0
- uses: actions/cache@v1
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
restore-keys: |
${{ runner.os }}-carthage-
- name: Install Carthage dependencies
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: carthage bootstrap --platform iOS --cache-builds
- name: Run iOS tests
run: set -o pipefail && xcodebuild test -scheme ACKategories-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11 Pro Max,OS=latest' ONLY_ACTIVE_ARCH=YES | xcpretty
- name: Run macOS tests
Expand Down
12 changes: 7 additions & 5 deletions ACKategories-iOSTests/UIViewControllerChildrenTests.swift
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@

import UIKit
import XCTest
import SnapKit
import ACKategories

final class UIViewControllerChildrenTests: XCTestCase {
Expand Down Expand Up @@ -37,10 +36,13 @@ final class UIViewControllerChildrenTests: XCTestCase {

let container = UIView()
vc.view.addSubview(container)
container.snp.makeConstraints { (make) in
make.center.equalToSuperview()
make.width.height.equalTo(100)
}
container.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
container.centerXAnchor.constraint(equalTo: vc.view.centerXAnchor),
container.centerYAnchor.constraint(equalTo: vc.view.centerYAnchor),
container.widthAnchor.constraint(equalToConstant: 100),
container.heightAnchor.constraint(equalToConstant: 100)
])

vc.display(childViewController: childVC, in: container)
vc.view.layoutIfNeeded()
Expand Down
35 changes: 0 additions & 35 deletions ACKategories.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -107,7 +107,6 @@
69FA5FC223C8690A00B44BCD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 69FA5FC123C8690A00B44BCD /* LaunchScreen.storyboard */; };
6A31C9F3250572FE0047A983 /* SelfSizingTableHeaderFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A31C9F2250572FE0047A983 /* SelfSizingTableHeaderFooterView.swift */; };
A33559012555270F009B9D89 /* FlowCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33559002555270F009B9D89 /* FlowCoordinatorTests.swift */; };
A3BA6848256BD043006DB42F /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695096B523C78F6600E8F457 /* SnapKit.framework */; };
A3BA685B256BEC7B006DB42F /* UIWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BA685A256BEC7B006DB42F /* UIWindow.swift */; };
A3BA6867256BECC6006DB42F /* UINavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BA6866256BECC6006DB42F /* UINavigationController.swift */; };
A3BA686E256BED96006DB42F /* Dummies.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BA686D256BED96006DB42F /* Dummies.swift */; };
Expand Down Expand Up @@ -233,8 +232,6 @@
6950969523C78CC200E8F457 /* DateFormattingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateFormattingTests.swift; sourceTree = "<group>"; };
6950969623C78CC200E8F457 /* StringTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringTests.swift; sourceTree = "<group>"; };
6950969723C78CC200E8F457 /* ArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayTests.swift; sourceTree = "<group>"; };
695096B423C78E6400E8F457 /* Cartfile.private */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = Cartfile.private; sourceTree = "<group>"; };
695096B523C78F6600E8F457 /* SnapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapKit.framework; path = Carthage/Build/iOS/SnapKit.framework; sourceTree = "<group>"; };
695096D823C7908B00E8F457 /* ACKategoriesExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ACKategoriesExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
696DF853245304F400A6AC69 /* ReusableViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReusableViewTests.swift; sourceTree = "<group>"; };
697CECF023C877B20019FE61 /* Aliases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Aliases.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -311,7 +308,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A3BA6848256BD043006DB42F /* SnapKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -382,15 +378,13 @@
isa = PBXGroup;
children = (
69FA5FC323C869A200B44BCD /* ACKategories.podspec */,
695096B423C78E6400E8F457 /* Cartfile.private */,
69FA5FE423C8712D00B44BCD /* Package.swift */,
69E819EC23C773240054687B /* ACKategoriesCore */,
69E819F723C773240054687B /* ACKategoriesCoreTests */,
69E81A0823C773370054687B /* ACKategories-iOS */,
69E81A1323C773370054687B /* ACKategories-iOSTests */,
695096D923C7908B00E8F457 /* ACKategoriesExample */,
69E819EB23C773240054687B /* Products */,
69E81A1E23C7735D0054687B /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -490,14 +484,6 @@
path = "ACKategories-iOSTests";
sourceTree = "<group>";
};
69E81A1E23C7735D0054687B /* Frameworks */ = {
isa = PBXGroup;
children = (
695096B523C78F6600E8F457 /* SnapKit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
69FA5F9123C868A900B44BCD /* Screens */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -672,7 +658,6 @@
695096D523C7908B00E8F457 /* Frameworks */,
695096D623C7908B00E8F457 /* Resources */,
695096F323C790A900E8F457 /* Embed Frameworks */,
CB998696568B841F5A05E3A0 /* Carthage */,
);
buildRules = (
);
Expand Down Expand Up @@ -919,26 +904,6 @@
shellPath = /bin/sh;
shellScript = "swiftlint autocorrect || true\nswiftlint || true\n";
};
CB998696568B841F5A05E3A0 /* Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"$(SRCROOT)/Carthage/xcfilelists/ACKategoriesExample-inputPaths.xcfilelist",
);
inputPaths = (
);
name = Carthage;
outputFileListPaths = (
"$(SRCROOT)/Carthage/xcfilelists/ACKategoriesExample-outputPaths.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
78 changes: 78 additions & 0 deletions ACKategories.xcodeproj/xcshareddata/xcschemes/ACKategoriesExample.xcscheme
View file
Open in desktop
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "695096D723C7908B00E8F457"
BuildableName = "ACKategoriesExample.app"
BlueprintName = "ACKategoriesExample"
ReferencedContainer = "container:ACKategories.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "695096D723C7908B00E8F457"
BuildableName = "ACKategoriesExample.app"
BlueprintName = "ACKategoriesExample"
ReferencedContainer = "container:ACKategories.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "695096D723C7908B00E8F457"
BuildableName = "ACKategoriesExample.app"
BlueprintName = "ACKategoriesExample"
ReferencedContainer = "container:ACKategories.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
3 changes: 0 additions & 3 deletions ACKategoriesCore/PropertyWrappers/UserDefault.swift
View file
Open in desktop
Expand Up @@ -106,9 +106,6 @@ extension UInt32: PropertyListValue {}
extension UInt64: PropertyListValue {}
extension Double: PropertyListValue {}
extension Float: PropertyListValue {}
#if os(macOS)
extension Float80: PropertyListValue {}
#endif

extension Array: PropertyListValue where Element: PropertyListValue {}

Expand Down
10 changes: 7 additions & 3 deletions ACKategoriesExample/Screens/Example list/ExampleListViewController.swift
View file
Open in desktop
Expand Up @@ -36,9 +36,13 @@ final class ExampleListViewController: BaseViewController<ExampleListViewModelin

let tableView = UITableView()
view.addSubview(tableView)
tableView.snp.makeConstraints { (make) in
make.edges.equalToSuperview()
}
tableView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
tableView.topAnchor.constraint(equalTo: view.topAnchor),
tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor)
])
self.tableView = tableView
}

Expand Down
10 changes: 7 additions & 3 deletions ACKategoriesExample/Screens/MapView/MapViewController.swift
View file
Open in desktop
Expand Up @@ -18,9 +18,13 @@ final class MapViewController: BaseViewController<MapViewModeling> {
let mapView = MKMapView()
view.addSubview(mapView)
mapView.delegate = self
mapView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
mapView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
mapView.topAnchor.constraint(equalTo: view.topAnchor),
mapView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
mapView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
mapView.trailingAnchor.constraint(equalTo: view.trailingAnchor)
])
self.mapView = mapView
}

Expand Down
8 changes: 5 additions & 3 deletions ACKategoriesExample/Screens/Modal/ModalViewController.swift
View file
Open in desktop
Expand Up @@ -25,9 +25,11 @@ final class ModalViewController: BaseViewControllerNoVM {
let button = UIButton(type: .system)
button.setTitle("Dismiss", for: .normal)
view.addSubview(button)
button.snp.makeConstraints { (make) in
make.center.equalToSuperview()
}
button.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
button.centerXAnchor.constraint(equalTo: view.centerXAnchor),
button.centerYAnchor.constraint(equalTo: view.centerYAnchor)
])
self.button = button
}

Expand Down
8 changes: 5 additions & 3 deletions ACKategoriesExample/Screens/UIControl blocks/UIControlBlocksViewController.swift
View file
Open in desktop
Expand Up @@ -28,9 +28,11 @@ final class UIControlBlocksViewController: BaseViewControllerNoVM {
}

view.addSubview(button)
button.snp.makeConstraints { make in
make.center.equalToSuperview()
}
button.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
button.centerXAnchor.constraint(equalTo: view.centerXAnchor),
button.centerYAnchor.constraint(equalTo: view.centerYAnchor)
])
self.button = button
}

Expand Down
9 changes: 6 additions & 3 deletions ACKategoriesExample/Screens/VC composition/TitleViewController.swift
View file
Open in desktop
Expand Up @@ -38,9 +38,12 @@ class TitleViewController: BaseViewControllerNoVM {
nameLabel.textAlignment = .center
nameLabel.text = name
view.addSubview(nameLabel)
nameLabel.snp.makeConstraints { (make) in
make.leading.trailing.top.equalTo(view.safeAreaLayoutGuide).inset(20)
}
nameLabel.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
nameLabel.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 20),
nameLabel.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: 20),
nameLabel.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -20)
])
self.nameLabel = nameLabel
}
}
12 changes: 7 additions & 5 deletions ACKategoriesExample/Screens/VC composition/VCCompositionViewController.swift
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
//

import UIKit
import SnapKit

final class VCCompositionViewController: TitleViewController {

Expand All @@ -28,10 +27,13 @@ final class VCCompositionViewController: TitleViewController {

let containerView = UIView()
view.addSubview(containerView)
containerView.snp.makeConstraints { (make) in
make.leading.trailing.bottom.equalToSuperview()
make.top.equalTo(nameLabel.snp.bottom).offset(30)
}
containerView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
containerView.topAnchor.constraint(equalTo: nameLabel.bottomAnchor, constant: 30),
containerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
containerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
containerView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
])

let childVC = TitleViewController(name: "Child", color: .blue)
display(childViewController: childVC, in: containerView)
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -8,6 +8,14 @@

## Next

### Fixed

- Remove support for unavailable type `Float80` on macOS ([#97](https://github.com/AckeeCZ/ACKategories/pull/97), kudos to @lukashromadnik)

### Changed

- Removed SnapKit from the library ([#97](https://github.com/AckeeCZ/ACKategories/pull/97), kudos to @lukashromadnik)

## 6.7.1

### Added
Expand Down
1 change: 0 additions & 1 deletion Cartfile.private
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.resolved
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/xcfilelists/ACKategoriesExample-inputPaths.xcfilelist
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/xcfilelists/ACKategoriesExample-outputPaths.xcfilelist
View file
Open in desktop

This file was deleted.