Merge pull request #19 from infinum/chore/spm-support

Add SPM Support
infinum · Aug 4, 2022 · 9dee530 · 9dee530
2 parents e62de8c + c6c49df
commit 9dee530
Show file tree

Hide file tree

Showing 40 changed files with 203 additions and 79 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
-  - Sentinel (1.0.0):
-    - Sentinel/Default (= 1.0.0)
-  - Sentinel/Core (1.0.0)
-  - Sentinel/CustomLocation (1.0.0):
+  - Sentinel (1.1.1):
+    - Sentinel/Default (= 1.1.1)
+  - Sentinel/Core (1.1.1)
+  - Sentinel/CustomLocation (1.1.1):
     - Sentinel/Core
-  - Sentinel/Default (1.0.0):
+  - Sentinel/Default (1.1.1):
     - Sentinel/Core
     - Sentinel/CustomLocation
     - Sentinel/TextEditing
     - Sentinel/UserDefaults
-  - Sentinel/TextEditing (1.0.0):
+  - Sentinel/TextEditing (1.1.1):
     - Sentinel/Core
-  - Sentinel/UserDefaults (1.0.0):
+  - Sentinel/UserDefaults (1.1.1):
     - Sentinel/Core
 
 DEPENDENCIES:
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sentinel: 2805e6de525f8c38d828045aea0c3acd24ca487d
+  Sentinel: 620185762371cdd6615c4f5e21519dfa3a9ad3fd
 
 PODFILE CHECKSUM: b1ea13fb80f56c4238650f0da0299d23734a6421
 

diff --git a/Example/Pods/Local Podspecs/Sentinel.podspec.json b/Example/Pods/Local Podspecs/Sentinel.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist
diff --git a/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Collar",
+        "repositoryURL": "https://github.com/infinum/ios-collar.git",
+        "state": {
+          "branch": null,
+          "revision": "f3c483ee7721146e4f846eb8d494542e5337c624",
+          "version": "1.0.3"
+        }
+      },
+      {
+        "package": "Loggie",
+        "repositoryURL": "https://github.com/infinum/iOS-Loggie.git",
+        "state": {
+          "branch": null,
+          "revision": "52180de1deabc66fda6e974dcf335e10e0f86036",
+          "version": "2.3.3"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,53 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Sentinel",
+    platforms: [
+        .iOS(.v11)
+    ],
+    products: [
+        .library(
+            name: "Sentinel",
+            targets: ["Sentinel"]
+        ),
+        .library(
+            name: "SentinelLoggie",
+            targets: ["SentinelLoggie"]
+        ),
+        .library(
+            name: "SentinelCollar",
+            targets: ["SentinelCollar"]
+        )
+    ],
+    dependencies: [
+        .package(name: "Loggie", url: "https://github.com/infinum/iOS-Loggie.git", .upToNextMajor(from: "2.3.3")),
+        .package(name: "Collar", url: "https://github.com/infinum/ios-collar.git", .upToNextMajor(from: "1.0.3"))
+    ],
+    targets: [
+        .target(
+            name: "Sentinel",
+            dependencies: [],
+            path: "Sentinel",
+            exclude: [
+                "Classes/Loggie/LoggieTool.swift",
+                "Classes/Collar/CollarTool.swift"
+            ],
+            resources: [
+                .process("Assets")
+            ]
+        ),
+        .target(
+            name: "SentinelLoggie",
+            dependencies: ["Sentinel", "Loggie"],
+            path: "Sentinel/Classes/Loggie"
+        ),
+        .target(
+            name: "SentinelCollar",
+            dependencies: ["Sentinel", "Collar"],
+            path: "Sentinel/Classes/Collar"
+        )
+    ]
+)
diff --git a/README.md b/README.md
@@ -27,13 +27,25 @@ To run the example project, clone the repo, and run `pod install` from the Examp
 
 ## Installation
 
+### CocoaPods
+
 Sentinel is available through [CocoaPods](https://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
 ```ruby
 pod 'Sentinel'
 ```
 
+### Swift Package Manager
+
+If you are using SPM for your dependency manager, add this to the dependencies in your `Package.swift` file:
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/infinum/ios-sentinel.git")
+]
+```
+
 ## Usage
 
 ### Features

diff --git a/Sentinel.podspec b/Sentinel.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Sentinel'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'Developer\'s toolbox for debugging applications'
 
   s.description      = <<-DESC

diff --git a/Sentinel/Classes/Collar/CollarTool.swift b/Sentinel/Classes/Collar/CollarTool.swift
@@ -6,6 +6,9 @@
 //
 
 import UIKit
+#if SWIFT_PACKAGE
+import Sentinel
+#endif
 import Collar
 
 public class CollarTool: Tool {

diff --git a/Sentinel/Classes/Core/CustomInfoTool.swift b/Sentinel/Classes/Core/CustomInfoTool.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class CustomInfoTool: NSObject, Tool {

diff --git a/Sentinel/Classes/Core/Internal/Sentinel.storyboard b/Sentinel/Classes/Core/Internal/Sentinel.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Sdy-Ei-cBG">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Sdy-Ei-cBG">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment version="4096" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <deployment version="4368" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -28,7 +28,7 @@
         <!--Sentinel Table View Controller-->
         <scene sceneID="FDi-AI-Vt5">
             <objects>
-                <viewController storyboardIdentifier="SentinelTableViewController" id="rmC-9c-kFK" customClass="SentinelTableViewController" customModule="Sentinel" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SentinelTableViewController" id="rmC-9c-kFK" customClass="SentinelTableViewController" customModule="Sentinel" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="aU9-Yk-LHE">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -63,7 +63,7 @@
         <!--Sentinel Tab Bar Controller-->
         <scene sceneID="B2D-lr-0y9">
             <objects>
-                <tabBarController storyboardIdentifier="SentinelTabBarController" id="n1S-5p-dpw" customClass="SentinelTabBarController" customModule="Sentinel" customModuleProvider="target" sceneMemberID="viewController">
+                <tabBarController storyboardIdentifier="SentinelTabBarController" id="n1S-5p-dpw" customClass="SentinelTabBarController" customModule="Sentinel" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="HPj-di-FwW">
                         <barButtonItem key="rightBarButtonItem" systemItem="done" id="aCt-BR-H3G">
                             <connections>

diff --git a/Sentinel/Classes/Core/Internal/SentinelInternal.swift b/Sentinel/Classes/Core/Internal/SentinelInternal.swift
@@ -5,7 +5,6 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
 import UIKit
 
 extension Sentinel {

diff --git a/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift b/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift
@@ -5,7 +5,7 @@
 //  Created by Zvonimir Medak on 28.09.2021..
 //
 
-import Foundation
+import UIKit
 
 final class SentinelTabBarController: UITabBarController {
 

diff --git a/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift b/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift
@@ -8,7 +8,13 @@
 import UIKit
 
 extension Bundle {
-    static var sentinel: Bundle { Bundle(for: Sentinel.self) }
+    static var sentinel: Bundle {
+        #if SWIFT_PACKAGE
+        .module
+        #else
+        Bundle(for: Sentinel.self)
+        #endif
+    }
 }
 
 extension UIStoryboard {

diff --git a/Sentinel/Classes/Core/Internal/UIImage+Assets.swift b/Sentinel/Classes/Core/Internal/UIImage+Assets.swift
@@ -5,7 +5,7 @@
 //  Created by Zvonimir Medak on 15.11.2021..
 //
 
-import Foundation
+import UIKit
 
 extension UIImage {
     enum SentinelImages{}

diff --git a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 18/11/2020.
 //
 
-import Foundation
+import UIKit
 
 class PerformanceInfoItem: NSObject {
 

diff --git a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="NUF-bl-auo" customClass="PerformanceInfoTableViewCell" customModule="ToolBox" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="NUF-bl-auo" customClass="PerformanceInfoTableViewCell" customModule="Sentinel">
             <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="NUF-bl-auo" id="2WE-a2-yhl">

diff --git a/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard b/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
         <!--Performance Info View Controller-->
         <scene sceneID="pfq-In-raC">
             <objects>
-                <viewController storyboardIdentifier="PerformanceInfoViewController" id="PQf-hC-S7N" customClass="PerformanceInfoViewController" customModule="ToolBox" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PerformanceInfoViewController" id="PQf-hC-S7N" customClass="PerformanceInfoViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="V6M-Il-AHB">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -21,8 +21,8 @@
                                 <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <color key="backgroundColor" systemColor="systemGroupedBackgroundColor"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="unY-ZM-oPM" customClass="PerformanceInfoTableViewCell" customModule="ToolBox" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="unY-ZM-oPM" customClass="PerformanceInfoTableViewCell" customModule="Sentinel">
+                                        <rect key="frame" x="0.0" y="49.5" width="414" height="43"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="unY-ZM-oPM" id="e1p-K7-kYu">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>

diff --git a/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift b/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 02/10/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Provides option to change enabled state of the feature.
 @objcMembers