4.0.2 release

.github/workflows/swift.yml

@@ -0,0 +1,15 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Fastlane Action
+      uses: maierj/fastlane-action@v1.0.0
+      with:
+        lane: scan_project

.gitignore

@@ -40,4 +40,5 @@ Carthage/
 
 # Cocoapods 
 Pods/
+fastlane/report.xml
 

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ==========
 
+### 4.0.1
+
+- Fix SPM 
+
 ### 4.0.0
 
 - Swift 5.1

OpenSourceController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = 'OpenSourceController'
-s.version          = '4.0.0'
+s.version          = '4.0.2'
 s.summary          = 'Display all the librarys licence used in your application. Enjoy !'
 s.description      = 'Display a screen with all licence used in your apply can be painful to maintain. OpenSourceController was built to respond to this problem. OpenSourceController is a simple parser to display the licences which are used in your application.'
 s.homepage         = 'https://github.com/floriangbh/OpenSourceController'

OpenSourceController.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		52D6D9871BEFF229002C0205 /* OpenSourceController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* OpenSourceController.framework */; };
-		76229B722180AD8400A61697 /* LicenceLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B712180AD8400A61697 /* LicenceLoader.swift */; };
 		76229B7D2180AD9F00A61697 /* HTTPDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */; };
 		76229B802180ADA800A61697 /* OpenSourceControllerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7E2180ADA800A61697 /* OpenSourceControllerConfig.swift */; };
 		76229B812180ADA800A61697 /* OpenSourceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7F2180ADA800A61697 /* OpenSourceController.swift */; };
@@ -16,6 +15,8 @@
 		769FD9D221871DEC00FB5A53 /* LicenceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9CE21871DEC00FB5A53 /* LicenceListViewController.swift */; };
 		769FD9D321871DEC00FB5A53 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9CF21871DEC00FB5A53 /* LoadingViewController.swift */; };
 		769FD9D421871DEC00FB5A53 /* OpenSourceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9D021871DEC00FB5A53 /* OpenSourceTableViewCell.swift */; };
+		76B7980F238844F300009193 /* LicenceLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B7980E238844F300009193 /* LicenceLoader.swift */; };
+		76B79811238845D300009193 /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B79810238845D300009193 /* Style.swift */; };
 		76D7F24521BEB18A004B74CB /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */; };
 		76D7F24621BEB18A004B74CB /* Reusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24121BEB18A004B74CB /* Reusable.swift */; };
 		76D7F24721BEB18A004B74CB /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */; };
@@ -37,7 +38,6 @@
 /* Begin PBXFileReference section */
 		52D6D97C1BEFF229002C0205 /* OpenSourceController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenSourceController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		52D6D9861BEFF229002C0205 /* OpenSourceController-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenSourceController-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		76229B712180AD8400A61697 /* LicenceLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceLoader.swift; path = Sources/Model/LicenceLoader.swift; sourceTree = "<group>"; };
 		76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPDataLoader.swift; path = Sources/Loader/HTTPDataLoader.swift; sourceTree = "<group>"; };
 		76229B7E2180ADA800A61697 /* OpenSourceControllerConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceControllerConfig.swift; path = Sources/OpenSourceControllerConfig.swift; sourceTree = "<group>"; };
 		76229B7F2180ADA800A61697 /* OpenSourceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceController.swift; path = Sources/OpenSourceController.swift; sourceTree = "<group>"; };
@@ -45,6 +45,8 @@
 		769FD9CE21871DEC00FB5A53 /* LicenceListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceListViewController.swift; path = Sources/Controller/LicenceListViewController.swift; sourceTree = "<group>"; };
 		769FD9CF21871DEC00FB5A53 /* LoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadingViewController.swift; path = Sources/Controller/LoadingViewController.swift; sourceTree = "<group>"; };
 		769FD9D021871DEC00FB5A53 /* OpenSourceTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceTableViewCell.swift; path = Sources/Controller/OpenSourceTableViewCell.swift; sourceTree = "<group>"; };
+		76B7980E238844F300009193 /* LicenceLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceLoader.swift; path = Sources/Loader/LicenceLoader.swift; sourceTree = "<group>"; };
+		76B79810238845D300009193 /* Style.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Style.swift; path = Sources/Utils/Style.swift; sourceTree = "<group>"; };
 		76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UITableView+Extensions.swift"; path = "Sources/Utils/UITableView+Extensions.swift"; sourceTree = "<group>"; };
 		76D7F24121BEB18A004B74CB /* Reusable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Reusable.swift; path = Sources/Utils/Reusable.swift; sourceTree = "<group>"; };
 		76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIViewController+Extensions.swift"; path = "Sources/Utils/UIViewController+Extensions.swift"; sourceTree = "<group>"; };
@@ -104,7 +106,6 @@
 		76229B702180AD7700A61697 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				76229B712180AD8400A61697 /* LicenceLoader.swift */,
 				76EAA84C1E93EDCD009A41DA /* LicenceFile.swift */,
 			);
 			name = Model;
@@ -114,6 +115,7 @@
 			isa = PBXGroup;
 			children = (
 				76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */,
+				76B7980E238844F300009193 /* LicenceLoader.swift */,
 			);
 			name = Loader;
 			sourceTree = "<group>";
@@ -125,6 +127,7 @@
 				76D7F24121BEB18A004B74CB /* Reusable.swift */,
 				76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */,
 				76D7F24421BEB18A004B74CB /* UIView+Extensions.swift */,
+				76B79810238845D300009193 /* Style.swift */,
 				76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */,
 			);
 			name = Utils;
@@ -287,15 +290,16 @@
 				76229B7D2180AD9F00A61697 /* HTTPDataLoader.swift in Sources */,
 				76D7F24621BEB18A004B74CB /* Reusable.swift in Sources */,
 				769FD9D221871DEC00FB5A53 /* LicenceListViewController.swift in Sources */,
+				76B79811238845D300009193 /* Style.swift in Sources */,
 				769FD9D121871DEC00FB5A53 /* OpenSourceViewController.swift in Sources */,
 				76D7F24721BEB18A004B74CB /* UIViewController+Extensions.swift in Sources */,
 				76EAA84F1E93EDCD009A41DA /* LicenceFile.swift in Sources */,
-				76229B722180AD8400A61697 /* LicenceLoader.swift in Sources */,
 				76D7F24521BEB18A004B74CB /* UITableView+Extensions.swift in Sources */,
 				769FD9D421871DEC00FB5A53 /* OpenSourceTableViewCell.swift in Sources */,
 				76D7F24821BEB18A004B74CB /* Array+Extensions.swift in Sources */,
 				76229B812180ADA800A61697 /* OpenSourceController.swift in Sources */,
 				769FD9D321871DEC00FB5A53 /* LoadingViewController.swift in Sources */,
+				76B7980F238844F300009193 /* LicenceLoader.swift in Sources */,
 				76229B802180ADA800A61697 /* OpenSourceControllerConfig.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Package.swift

@@ -1,28 +1,18 @@
 // swift-tools-version:5.1
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
 import PackageDescription
 
 let package = Package(
     name: "OpenSourceController",
+    platforms: [.iOS(.v10)],
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(name: "OpenSourceController", targets: ["OpenSourceController"])
-        .library(
-            name: "OpenSourceController",
-            targets: ["OpenSourceController"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+      .target(
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        name: "OpenSourceController",
-        .target(
+        path: "",
-            name: "OpenSourceController",
+        sources: ["Sources"]
-            dependencies: []),
+      )
-        .testTarget(
+    ],
-            name: "OpenSourceControllerTests",
+    swiftLanguageVersions: [.v4, .v5]
-            dependencies: ["OpenSourceController"]),
-    ]
 )

README.md

@@ -10,10 +10,10 @@
 
 <p align="center">
 <a href="#features">Features</a>
-• <a href="#installation">Installation</a>
 • <a href="#usage">Usage</a>
 • <a href="#translation">Translation</a>
 • <a href="#customisation">Customisation</a>
+• <a href="#installation">Installation</a>
 • <a href="#license">License</a>
 </p>
 
@@ -28,39 +28,11 @@ Display a screen with all licences used in your application can be painful to ma
 - [x] Display tableView with licences used in your app 
 - [x] Download licence from an URL
 
-## Todo (feel free to make PR)
-
-- [ ] Download licence from Podfile (https://github.com/terflogag/OpenSourceController/issues/1)
-- [ ] Download licence from Cartfile (https://github.com/terflogag/OpenSourceController/issues/2)
-- [ ] Download licence from local file
-
 ## Requirements
 
-* Xcode 9
+* Xcode 11
 * iOS 9.0+ target deployment
-* Swift 3, Swift 4 or Swift 4.2 project
+* Swift 3, Swift 4 or Swift 5.1 project
-
-## Installation
-
-- To integrate OpenSourceController into your Xcode project using [CocoaPods](http://cocoapods.org), specify it in your Podfile :
-
-```ruby
-pod "OpenSourceController", '~> 3.0.0' # Swift 4.2 Version
-
-pod "OpenSourceController", '~> 2.0' # Swift 4.0 Version 
-
-pod "OpenSourceController", '~> 1.0.8' # Swift 3.1 version
-```
-
-- To integrate OpenSourceController into your Xcode project using [Carthage](https://github.com/Carthage/Carthage), specify it in your Cartfile :
-
-```ruby
-github "floriangbh/OpenSourceController" ~> 3.0.0 # Swift 4.2 version
-
-github "floriangbh/OpenSourceController" ~> 2.0 # Swift 4.0 version
-
-github "floriangbh/OpenSourceController" ~> 1.0.8 # Swift 3.1 version
-```
 
 ## Usage
 
@@ -124,6 +96,30 @@ OpenSourceController is currently write in english. If you need translation for
 "Unable to load this licence." = "<your_translation>";
 ```
 
+## Installation
+
+- To integrate OpenSourceController into your Xcode project using [Swift Packet Manager](https://github.com/apple/swift-package-manager), specify this url in Xcode : `https://github.com/floriangbh/OpenSourceController`
+
+- To integrate OpenSourceController into your Xcode project using [CocoaPods](http://cocoapods.org), specify it in your Podfile :
+
+```ruby
+pod "OpenSourceController", '~> 3.0.0' # Swift 4.2 Version
+
+pod "OpenSourceController", '~> 2.0' # Swift 4.0 Version 
+
+pod "OpenSourceController", '~> 1.0.8' # Swift 3.1 version
+```
+
+- To integrate OpenSourceController into your Xcode project using [Carthage](https://github.com/Carthage/Carthage), specify it in your Cartfile :
+
+```ruby
+github "floriangbh/OpenSourceController" ~> 3.0.0 # Swift 4.2 version
+
+github "floriangbh/OpenSourceController" ~> 2.0 # Swift 4.0 version
+
+github "floriangbh/OpenSourceController" ~> 1.0.8 # Swift 3.1 version
+```
+
 ## Author
 
 Florian Gabach, florian.gabach@gmail.com

fastlane/Fastfile

@@ -18,6 +18,11 @@ platform :ios do
     release("major")
   end
 
+  desc "Scan the project"
+  lane :scan_project do
+    scan(scheme: "OpenSourceController-iOS")
+  end
+
   def release(type)
     podspec_name = "OpenSourceController.podspec" 
     pod_lib_lint(use_bundle_exec: false)

fastlane/README.md

@@ -31,6 +31,11 @@ Release a new version with a minor bump_type
 fastlane ios major
 ```
 Release a new version with a major bump_type
+### ios buildproject
+```
+fastlane ios buildproject
+```
+Build the project
 
 ----
 

fastlane/test_output/report.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Test Results | xcpretty</title>
+    <style type="text/css">
+      body { font-family:Avenir Next, Helvetica Neue, sans-serif; color: #4A4A4A; background-color: #F0F3FB; margin:0;}
+      h1 { font-weight: normal; font-size: 24px; margin: 10px 0 0 0;}
+      h3 { font-weight: normal; margin: 2px; font-size: 1.1em;}
+      header { position: fixed;width: 100%;background: rgba(249, 254, 255, 0.9);margin: 0;padding: 10px;}
+      header:before, header:after { content:""; display:table;}
+      header:after { clear:both;}
+      a:link { color: #A1D761;}
+      footer { clear: both;position: relative;z-index: 10;height: 40px;margin-top: -10px; margin-left:30px; font-size:12px;}
+      table { width:100%; border-collapse: collapse;}
+      tr td:first-child { width:7%}
+      .left { float: left; margin-left:30px;}
+      .right { float: right; margin-right: 40px; margin-top: 0; margin-bottom:0;}
+      .test-suite { margin: 0 0 30px 0;}
+      .test-suite > .heading { font-family:Menlo, Monaco, monospace; font-weight: bold; border-color: #A1D761; background-color: #B8E986; border-width: 1px;}
+      .test-suite.failing > .heading { border-color: #C84F5E; background-color: #E58591;}
+      .test-suite > .heading > .title { margin-top: 4px; margin-left: 10px;}
+      .tests { overflow: scroll;margin: 0 30px 0 60px;}
+      .test, .test-suite > .heading { height: 30px; overflow: hidden; margin: 0 30px;}
+      .test, .test-suite > .heading { border-width: 1px; border-collapse: collapse; border-style: solid; }
+      .test { margin-left: 30px; border-top:none;}
+      .test.failing { border-color: #C84F5E; background-color: #F4DDE0;}
+      .test.passing { border-color: #A1D761;}
+      .test.failing { background-color: #E7A1AA;}
+      .test.passing { background-color: #CAF59F;}
+      .test.failing.odd { background-color: #EEC7CC;}
+      .test.passing.odd { background-color: #E5FBCF;}
+      .details.failing { background-color: #F4DDE0; border: 1px solid #C84F5E;}
+      .details.passing { background-color: #E5F4DC; border: 1px solid #A1D761;}
+      .test .test-detail:last-child { padding-bottom: 8px;}
+      .test .title { float: left; font-size: 0.9em; margin-top: 8px; font-family: Menlo, Monaco, monospace;}
+      .test .time { float: left;margin: 4px 10px 0 20px;}
+      .test-detail { font-family:Menlo, Monaco, monospace; font-size: 0.9em; margin: 5px 0 5px 0px;}
+      .screenshots { height: auto; overflow: hidden; padding: 4px 4px 0 4px; background-color: #B8E986; border: #A1D761; border-width: 0 1px; border-style: solid; }
+      .screenshots.failing { border-color: #C84F5E; background-color: #E58591; }
+      .screenshot { max-height: 60px; float: left; transition: max-height 0.2s; margin: 0 4px 4px 0 }
+      .screenshot.selected { max-height: 568px; }
+      #test-suites { display: inline-block; width: 100%;margin-top:100px;}
+      #segment-bar { margin-top: 10px;margin-left: 14px;float:right;}
+      #segment-bar a:first-child { border-radius: 9px 0 0 9px; border-right: none;}
+      #segment-bar a:last-child { border-radius: 0 9px 9px 0; border-left: none;}
+      #segment-bar > a { color: #565656; border: 2px solid  #7B7B7B; width: 80px; font-weight: bold; display:inline-block;text-align:center; font-weight: normal;}
+      #segment-bar > a.selected { background-color: #979797; color: #F0F3FB;}
+      #counters { float: left;margin: 10px;text-align: right;}
+      #counters h2 { font-size: 16px; font-family: Avenir, sans-serif; font-weight: lighter; display:inline;}
+      #counters .number { font-size: 20px;}
+      #fail-count { color: #D0021B; margin-left:10px;}
+      @media (max-width: 640px) {
+        h1, #counters, #segment-bar { margin: 5px auto; text-align:center;}
+        header, #segment-bar { width: 100%; position: relative; background:none;}
+        .left, .right { float:none; margin:0;}
+        #test-suites { margin-top: 0;}
+        #counters { float:none;}
+      }
+    </style>
+    <script type="text/javascript">
+      var hide = function(element) { element.style.display = 'none';}
+      var show = function(element) { element.style.display = '';}
+      var isHidden = function(element) { return element.style.display == 'none';}
+      var isSelected = function(element) { return element.classList.contains("selected");}
+      var deselect = function(element) { return element.classList.remove("selected");}
+      var select = function(element) { return element.classList.add("selected");}
+      var toggle = function(element) { isHidden(element) ? show(element) : hide(element);};
+      var toggleTests = function(heading) { toggle(heading.parentNode.children[1]);};
+      var toggleDetails = function(detailClass) {
+        var details = document.querySelectorAll('.' + detailClass);
+        for (var i = details.length - 1; i >= 0; i--) { toggle(details[i]);};
+      };
+      var hideAll = function(collection) {
+        for (var i = collection.length - 1; i >= 0; i--) { hide(collection[i]); };
+      }
+      var showAll = function(collection) {
+        for (var i = collection.length - 1; i >= 0; i--) { show(collection[i]); };
+      }
+      var selectSegment = function(segment) {
+        if (isSelected(segment)) return;
+        var segments = document.querySelectorAll('#segment-bar > a');
+        for (var i = segments.length - 1; i >= 0; i--) { deselect(segments[i]);};
+        select(segment);
+        if (segment.id == "all-segment") {
+          showAll(document.querySelectorAll('.test-suite'));
+          showAll(document.querySelectorAll('.test'));
+        } else if (segment.id == "failing-segment") {
+          hideAll(document.querySelectorAll('.test.passing'));
+          showAll(document.querySelectorAll('.test.failing'));
+          hideAll(document.querySelectorAll('.test-suite.passing'));
+          showAll(document.querySelectorAll('.test-suite.failing'));
+        } else if (segment.id == "passing-segment") {
+          hideAll(document.querySelectorAll('.test.failing'));
+          showAll(document.querySelectorAll('.test.passing'));
+          hideAll(document.querySelectorAll('.test-suite.failing'));
+          showAll(document.querySelectorAll('.test-suite.passing'));
+        }
+      }
+      var toggleScreenshot = function(suiteName, index) {
+        var screenshot = document.getElementById("screenshot-" + suiteName + "-" + index);
+        isSelected(screenshot) ? deselect(screenshot) : select(screenshot);
+      }
+    </script>
+  </head>
+  <body>
+    <header>
+      <section class="left">
+        <h1>Test Results</h1>
+      </section>
+      <section class="right">
+        <section id="counters">
+          <h2 id="test-count"><span class="number">0</span> tests</h2>
+          
+        </section>
+        <section id="segment-bar">
+          <a id="all-segment" onclick="selectSegment(this);" class="selected">All</a><a id="failing-segment" onclick="selectSegment(this);">Failing</a><a id="passing-segment" onclick="selectSegment(this);">Passing</a>
+        </section>
+      </section>
+    </header>
+    <section id="test-suites">
+      
+    </section>
+    <footer>Report generated with <a href="https://github.com/supermarin/xcpretty">xcpretty</a></footer>
+  </body>
+</html>

fastlane/test_output/report.junit

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<testsuites tests='0' failures='0'/>