Merge pull request #185 from spring-media/feature/swift-package-manager

Swift Package Manager Support
spring-media · Jul 9, 2020 · 90935f2 · 90935f2
2 parents 169502a + ba2d969
commit 90935f2
Show file tree

Hide file tree

Showing 186 changed files with 2,480 additions and 2,159 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,15 @@
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## macOS 
+.DS_Store
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,18 +19,33 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+.bundle/
 
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
 
@@ -31,4 +55,13 @@ DerivedData
 # Carthage/Checkouts
 
 Carthage/
-.bundle
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -0,0 +1,5 @@
+## Sources
+sonar.sources=Sources
+
+## Tests
+sonar.tests=Tests
diff --git a/.swift-version b/.swift-version
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/...oj/xcshareddata/xcschemes/Carlos.xcscheme → ...de/xcshareddata/xcschemes/Carlos.xcscheme b/...oj/xcshareddata/xcschemes/Carlos.xcscheme → ...de/xcshareddata/xcschemes/Carlos.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1150"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
-               BuildableName = "Carlos.framework"
+               BlueprintIdentifier = "Carlos"
+               BuildableName = "Carlos"
                BlueprintName = "Carlos"
-               ReferencedContainer = "container:Carlos.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -28,10 +28,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "52635A651B4F110500F187EE"
-               BuildableName = "CarlosTests.xctest"
+               BlueprintIdentifier = "CarlosTests"
+               BuildableName = "CarlosTests"
                BlueprintName = "CarlosTests"
-               ReferencedContainer = "container:Carlos.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -40,40 +40,30 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Carlos"
+            BuildableName = "Carlos"
+            BlueprintName = "Carlos"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "52635A651B4F110500F187EE"
-               BuildableName = "CarlosTests.xctest"
+               BlueprintIdentifier = "CarlosTests"
+               BuildableName = "CarlosTests"
                BlueprintName = "CarlosTests"
-               ReferencedContainer = "container:Carlos.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "52051DAE1C79D950005F861A"
-               BuildableName = "PiedPiperTests.xctest"
-               BlueprintName = "PiedPiperTests"
-               ReferencedContainer = "container:Carlos.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
-            BuildableName = "Carlos.framework"
-            BlueprintName = "Carlos"
-            ReferencedContainer = "container:Carlos.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,17 +75,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
-            BuildableName = "Carlos.framework"
-            BlueprintName = "Carlos"
-            ReferencedContainer = "container:Carlos.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -106,10 +85,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52635A1C1B4F0F3D00F187EE"
-            BuildableName = "Carlos.framework"
+            BlueprintIdentifier = "Carlos"
+            BuildableName = "Carlos"
             BlueprintName = "Carlos"
-            ReferencedContainer = "container:Carlos.xcodeproj">
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ cache:
   bundler: true
   directories:
   - "./Carthage"
-osx_image: xcode10.2
+osx_image: xcode11.5
 
 # before_install:
 before_script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.0
+- Swift Package Manager Support 
+- Xcode 11.5 Migration
+
 ## 0.9
 
 **Breaking changes**

diff --git a/Carlos.podspec b/Carlos.podspec
@@ -7,24 +7,24 @@
 
 Pod::Spec.new do |s|
   s.name             = "Carlos"
-  s.version          = "0.9.1"
+  s.version          = "0.10.0"
   s.summary          = "A simple but flexible cache."
   s.description      = <<-DESC
-			Carlos is a small set of classes convenience operators to realize custom, flexible and powerful cache layers in your iOS, watchOS 2, tvOS and Mac OS X applications.
+			Carlos is a small set of classes convenience operators to realize custom, flexible and powerful cache layers in your iOS, watchOS 3, tvOS and Mac OS X applications.
                        DESC
-  s.homepage         = "https://github.com/WeltN24/Carlos"
+  s.homepage         = "https://github.com/spring-media/Carlos"
   s.license          = 'MIT'
   s.author           = { "Vittorio Monaco" => "[email protected]" }
-  s.source           = { :git => "https://github.com/WeltN24/Carlos.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/spring-media/Carlos.git", :tag => s.version.to_s }
+  s.swift_version    = '5.0'
 
-  s.ios.deployment_target = '8.0'
-  s.watchos.deployment_target = '2.0'
-
-  s.requires_arc = true
-
-  s.dependency 'PiedPiper', '~> 0.10.1'
+  s.ios.deployment_target     = '10.0'
+  s.watchos.deployment_target = '3.0'
 
-  s.ios.source_files = 'Carlos/*.swift', 'Carlos/NSKeyedUnarchiver+SwiftUtilities.{h,m}'
-  s.watchos.source_files = 'Carlos/*.swift', 'Carlos/NSKeyedUnarchiver+SwiftUtilities.{h,m}'
+  s.source_files          = 'Carlos/*.swift'
   s.watchos.exclude_files = 'Carlos/MemoryWarning.swift'
+
+  s.dependency 'PiedPiper', '~> 0.11.0'
+
+  s.requires_arc = true
 end